@tremho/mist-lift 2.2.8 → 2.4.0

package/build/expressRoutes/functionBinder.js

@@ -35,8 +35,10 @@ const express_1 = __importDefault(require("express"));
 const ApiBuildCollector_1 = require("../lib/openAPI/ApiBuildCollector");
 const openApiConstruction_1 = require("../lib/openAPI/openApiConstruction");
 const inverse_y_1 = require("@tremho/inverse-y");
+const TypeCheck_1 = require("../lib/TypeCheck");
 const clearModule = require('clear-module');
 const router = express_1.default.Router();
+router.use(express_1.default.raw({ type: '*/*', limit: '6mb' }));
 function functionBinder() {
     const defs = (0, ApiBuildCollector_1.gatherFunctionDefinitions)();
     (0, openApiConstruction_1.buildOpenApi)(defs).then(() => {
@@ -66,26 +68,42 @@ function functionBinder() {
                 const n = entryRoot.indexOf('/{');
                 if (n !== -1)
                     entryRoot = entryRoot.substring(0, n) + '/*';
-                const callHandler = (pathMap, req, res) => {
-                    const event = requestToEvent(pathMap, req);
+                const callHandler = (def, req, res) => {
+                    console.log('>>>>>>> YES WE ARE HERE<<<<<<<<<');
+                    if (Buffer.isBuffer(req.body)) {
+                        const buffer = req.body;
+                        console.log('body is a buffer at callHandler. Length is ' + buffer.byteLength);
+                        console.log('First 16 bytes:', buffer.subarray(0, 16).toString('hex'));
+                    }
+                    const message = testPathRoute(def, req);
+                    if (message) {
+                        return handleResponse(res, { statusCode: 403, body: { error: message } });
+                    }
+                    const event = requestToEvent(def, req);
+                    try {
+                        performParameterTesting(def, event);
+                    }
+                    catch (e) {
+                        return handleResponse(res, { statusCode: 400, body: { error: e.message } });
+                    }
                     Promise.resolve(start(event, null, null)).then(respOut => {
                         handleResponse(res, respOut);
                     }).catch((reason) => undefined);
                 };
                 if (method === 'get') {
-                    router.get(entryRoot, (req, res) => callHandler(pathMap, req, res));
+                    router.get(entryRoot, (req, res) => callHandler(def, req, res));
                 }
                 else if (method === 'post') {
-                    router.post(entryRoot, (req, res) => callHandler(pathMap, req, res));
+                    router.post(entryRoot, (req, res) => callHandler(def, req, res));
                 }
                 else if (method === 'put') {
-                    router.put(entryRoot, (req, res) => callHandler(pathMap, req, res));
+                    router.put(entryRoot, (req, res) => callHandler(def, req, res));
                 }
                 else if (method === 'patch') {
-                    router.patch(entryRoot, (req, res) => callHandler(pathMap, req, res));
+                    router.patch(entryRoot, (req, res) => callHandler(def, req, res));
                 }
                 else if (method === 'delete') {
-                    router.delete(entryRoot, (req, res) => callHandler(pathMap, req, res));
+                    router.delete(entryRoot, (req, res) => callHandler(def, req, res));
                 }
                 else {
                     console.log(ac.red.bold('Cannot map method ') + ac.blue.bold(method));
@@ -101,21 +119,142 @@ function functionBinder() {
     }).catch((reason) => undefined);
 }
 exports.functionBinder = functionBinder;
-function requestToEvent(template, req) {
+// compare request route to the definition of this function to see if it matches
+function testPathRoute(def, req) {
+    let path = req.path;
+    let pathMap = def.pathMap;
+    if (path.endsWith('/'))
+        path = path.substring(0, path.length - 1);
+    if (pathMap.endsWith('/'))
+        pathMap = pathMap.substring(0, path.length - 1);
+    const defParts = pathMap.split('/');
+    const pathParts = path.split('/');
+    let message = '';
+    if (pathParts.length > defParts.length) {
+        message = 'Too many parameters passed on path';
+    }
+    if (pathParts.length < defParts.length) {
+        message = 'Too few parameters passed on path';
+    }
+    return message;
+}
+function performParameterTesting(def, event) {
+    var _a;
+    // for every parameter defined in def
+    // find the corresponding value in event.parameters (by name)
+    // find the constraints for that parameter in def
+    // test the value against the constraints
+    for (const pdef of ((_a = def.parameters) !== null && _a !== void 0 ? _a : [])) {
+        const constraints = Array.isArray(pdef.constraints) ? (0, TypeCheck_1.parseConstraints)(pdef.type, pdef.constraints.join('\n'), '\n') : undefined;
+        let value = event.parameters[pdef.name];
+        if (value === undefined) {
+            if (!pdef.required)
+                return; // okay to be undefined
+        }
+        if (pdef.type === 'number')
+            value = Number(value); // TODO: Type coercion for all types
+        constraints === null || constraints === void 0 ? void 0 : constraints.test(value);
+    }
+}
+// returns 'text', 'json', or undefined
+function bodyTypeCollapse(type) {
+    const options = {
+        text: 'text',
+        json: 'json',
+        'application/json': 'json'
+    };
+    if (type) {
+        type = type.toLowerCase().trim();
+        if (type.substring(0, 5) === 'text/')
+            return 'text';
+        return options[type];
+    }
+}
+function requestToEvent(def, req) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    console.log('requestToEvent (express)...', req.body, typeof (req.body));
-    // unpack weird choice of express when passed from curl.
-    if (typeof (req.body) === 'object') {
-        const bprops = Object.getOwnPropertyNames(req.body);
-        if (bprops.length === 1) {
+    console.warn('requestToEvent (express)... body is type ', typeof (req.body));
+    const isBuffer = Buffer.isBuffer(req.body);
+    console.log('Body is a buffer ', isBuffer);
+    console.log('bodyType from def is ', def.bodyType);
+    // lets assume template says the type
+    const type = bodyTypeCollapse(def.bodyType);
+    console.log('collapsed bodyType is ', type);
+    if (type === 'text') {
+        console.log('>> we want plain text');
+        if (typeof req.body === 'object') {
+            console.log('>> requestToEvent modifying body (text)');
+            if (Buffer.isBuffer(req.body)) {
+                req.body = req.body.toString();
+                console.log('>> just turned it to a string ', req.body);
+            }
+            else {
+                req.body = JSON.stringify(req.body);
+                console.log('>> is is an object, make it a json string ', req.body);
+            }
+        }
+    }
+    else if (type === 'json') {
+        console.log('>> we want json');
+        if (typeof req.body === 'object') {
+            if (Buffer.isBuffer(req.body)) {
+                console.log('>> converting first from buffer to string');
+                req.body = req.body.toString();
+            }
+        }
+        if (typeof req.body === 'string') {
+            console.log('>> body is a string', req.body);
             try {
-                req.body = JSON.parse(bprops[0]);
+                console.log('>> requestToEvent modifying body (json2)');
+                req.body = JSON.parse(req.body);
+                console.log(">> it's now an object ", req.body);
             }
             catch (e) {
-                console.error('failed request body parse', bprops[0]);
+                console.error(ac.bold.red('Failed request body JSON parse '), req.body);
             }
         }
+        else {
+            console.log('We already have an object here as ', req.body);
+        }
+    }
+    else {
+        console.log('>> binary type path');
+        // binary expects a buffer
+        if (!Buffer.isBuffer(req.body)) { // if already a buffer, leave as is
+            if (typeof req.body === 'object') {
+                req.body = JSON.stringify(req.body); // make a string first before we bufferize the json
+            }
+            req.body = Buffer.from(req.body);
+        }
+    }
+    if (Buffer.isBuffer(req.body)) {
+        const buffer = req.body;
+        console.log('body is buffer eventToRequest, Length = ' + buffer.byteLength);
+        console.log('First 16 bytes:', buffer.subarray(0, 16).toString('hex'));
+    }
+    const template = def.pathMap;
+    // unpack weird choice of express when passed from curl.
+    /*
+    if (typeof (req.body) === 'object' && !Buffer.isBuffer(req.body)) {
+      console.log(">> in curl case", req.body)
+      let bprops:string[] = []
+      try {
+        bprops = Object.getOwnPropertyNames(req.body)
+        console.log(">> bprops ", bprops)
+      } catch(e:any) {}
+      if (bprops.length === 1) {
+        const bText = req.body[bprops[0]]
+        console.log(">> bText ",bText)
+        try {
+          req.body = JSON.parse(bText)
+        } catch (e: any) {
+          console.warn(ac.bold.yellow.italic('Failed request body JSON parse Yellow'), '(curl)')
+          req.body = bText
+          return requestToEvent(def, req)
+        }
+      }
     }
+     */
+    console.log('last look at body', req.body);
     let path = (_a = req.originalUrl) !== null && _a !== void 0 ? _a : '';
     const qi = path.indexOf('?');
     if (qi !== -1)
@@ -146,7 +285,10 @@ function requestToEvent(template, req) {
         const brknm = ((_k = tslots[i]) !== null && _k !== void 0 ? _k : '').trim();
         if (brknm.charAt(0) === '{') {
             const pn = brknm.substring(1, brknm.length - 1);
-            parameters[pn] = ((_l = pslots[i]) !== null && _l !== void 0 ? _l : '').trim();
+            let pv = ((_l = pslots[i]) !== null && _l !== void 0 ? _l : '').trim();
+            if (pv === 'undefined' || pv === '~')
+                pv = undefined;
+            parameters[pn] = pv;
         }
     }
     for (const p of Object.getOwnPropertyNames(req.query)) {
@@ -156,7 +298,7 @@ function requestToEvent(template, req) {
     // console.warn(">>> functionBinder geting headers", {req, headers})
     // const apiKey = req.header('x-api-key')
     // console.warn(">>> apiKey returned using header function", {apiKey})
-    console.log('making eventOut with req.body=', req.body);
+    // console.log('making eventOut with req.body=', req.body)
     const eventOut = {
         requestContext: req,
         request: {

package/build/expressRoutes/functionBinder.js.map

@@ -1 +1 @@
-{"version":3,"file":"functionBinder.js","sourceRoot":"","sources":["../../src/expressRoutes/functionBinder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"functionBinder.js","sourceRoot":"","sources":["../../src/expressRoutes/functionBinder.ts"],"names":[],"mappings":"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"}

package/build/lib/DirectoryUtils.js

@@ -8,7 +8,8 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 // Recurse a directory, calling back to a 'for-each' callback for all files in tree
 function recurseDirectory(dirpath, callback) {
-    fs_1.default.readdirSync(dirpath).forEach((file) => {
+    const fl = fs_1.default.readdirSync(dirpath);
+    fl.forEach((file) => {
         const fpath = path_1.default.join(dirpath, file);
         // if(fpath.indexOf('node_modules') === -1) {
         const stat = fs_1.default.statSync(fpath);

package/build/lib/DirectoryUtils.js.map

@@ -1 +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,6CAA6C;QAC7C,MAAM,IAAI,GAAG,YAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC/B,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;QACD,IAAI;IACN,CAAC,CAAC,CAAA;AACJ,CAAC;AAZD,4CAYC;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"}
+{"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,MAAM,EAAE,GAAG,YAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;IAClC,EAAE,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;QAC1B,MAAM,KAAK,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;QACtC,6CAA6C;QAC7C,MAAM,IAAI,GAAG,YAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC/B,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;QACD,IAAI;IACN,CAAC,CAAC,CAAA;AACJ,CAAC;AAbD,4CAaC;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/IdSrc.js

@@ -1,11 +1,21 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decoratedName = exports.getIdSrc = exports.getIdDelimiter = void 0;
+exports.getAccountId = exports.decoratedName = exports.getIdSrc = exports.getIdDelimiter = void 0;
 const LiftVersion_1 = require("../lib/LiftVersion");
 const sha1_1 = __importDefault(require("sha1"));
+const client_sts_1 = require("@aws-sdk/client-sts");
 function getIdDelimiter() {
     return '_-_';
 }
@@ -17,27 +27,41 @@ function getIdSrc() {
         idsrc = idsrc.replace(' ', '_');
     while (idsrc.includes('.'))
         idsrc = idsrc.replace('.', '-');
+    const projectHash = (0, sha1_1.default)(idsrc).toString().substring(0, 8);
+    // console.log("project hash", {idsrc, projectHash})
+    idsrc = (0, LiftVersion_1.getProjectName)() + '_' + projectHash;
+    // console.log("idsrc is "+idsrc)
     return idsrc;
 }
 exports.getIdSrc = getIdSrc;
 function decoratedName(name) {
-    if (name.includes(getIdDelimiter())) {
+    if (name.includes(getIdDelimiter()) && name.includes(getIdSrc())) {
         // console.warn('name '+name+' appears to be decorated already')
         return name;
     }
     while (name.includes('/'))
         name = name.replace('/', '');
     const hash8 = (0, sha1_1.default)(name.toLowerCase()).toString().substring(0, 8);
-    const fullName = name + getIdDelimiter() + getIdSrc();
+    const fullName = name + getIdDelimiter() + '_' + getIdSrc();
+    // console.log("fullname is "+fullName)
     let dname;
     if (name.startsWith('fileserve_')) {
-        dname = ('fileServe_' + hash8 + getIdDelimiter() + getIdSrc()).substring(0, 64);
+        dname = ('fileServe_' + hash8 + getIdDelimiter() + '_' + getIdSrc()).substring(0, 64);
     }
     else {
-        dname = fullName.substring(0, 50) + '_' + hash8;
+        dname = fullName; // .substring(0, 50) + '_' + hash8
     }
     // console.warn('decorated to '+dname+' from '+name)
     return dname;
 }
 exports.decoratedName = decoratedName;
+function getAccountId() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const client = new client_sts_1.STSClient({});
+        const command = new client_sts_1.GetCallerIdentityCommand({});
+        const response = yield client.send(command);
+        return response.Account; // This is your AWS account ID
+    });
+}
+exports.getAccountId = getAccountId;
 //# sourceMappingURL=IdSrc.js.map

package/build/lib/IdSrc.js.map

@@ -1 +1 @@
-{"version":3,"file":"IdSrc.js","sourceRoot":"","sources":["../../src/lib/IdSrc.ts"],"names":[],"mappings":";;;;;;AACA,oDAAsE;AACtE,gDAAuB;AAEvB,SAAgB,cAAc;IAC5B,OAAO,KAAK,CAAA;AACd,CAAC;AAFD,wCAEC;AACD,SAAgB,QAAQ;;IACtB,IAAI,KAAK,GAAG,EAAE,GAAG,CAAC,MAAA,IAAA,4BAAc,GAAE,mCAAI,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,MAAA,MAAA,IAAA,+BAAiB,GAAE,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC,CAAA;IAC3F,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC3D,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAE3D,OAAO,KAAK,CAAA;AACd,CAAC;AAND,4BAMC;AACD,SAAgB,aAAa,CAAE,IAAY;IACzC,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC;QACpC,gEAAgE;QAChE,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAEvD,MAAM,KAAK,GAAG,IAAA,cAAI,EAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAEjE,MAAM,QAAQ,GAAG,IAAI,GAAG,cAAc,EAAE,GAAG,QAAQ,EAAE,CAAA;IACrD,IAAI,KAAK,CAAA;IACT,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAClC,KAAK,GAAG,CAAC,YAAY,GAAG,KAAK,GAAG,cAAc,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IACjF,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,KAAK,CAAA;IACjD,CAAC;IACD,oDAAoD;IACpD,OAAO,KAAK,CAAA;AACd,CAAC;AAnBD,sCAmBC"}
+{"version":3,"file":"IdSrc.js","sourceRoot":"","sources":["../../src/lib/IdSrc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,oDAAsE;AACtE,gDAAuB;AACvB,oDAAyE;AAEzE,SAAgB,cAAc;IAC5B,OAAO,KAAK,CAAA;AACd,CAAC;AAFD,wCAEC;AACD,SAAgB,QAAQ;;IACtB,IAAI,KAAK,GAAG,EAAE,GAAG,CAAC,MAAA,IAAA,4BAAc,GAAE,mCAAI,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,MAAA,MAAA,IAAA,+BAAiB,GAAE,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC,CAAA;IAC3F,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC3D,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAE3D,MAAM,WAAW,GAAG,IAAA,cAAI,EAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC1D,oDAAoD;IACpD,KAAK,GAAG,IAAA,4BAAc,GAAE,GAAG,GAAG,GAAG,WAAW,CAAA;IAC5C,iCAAiC;IACjC,OAAO,KAAK,CAAA;AACd,CAAC;AAVD,4BAUC;AACD,SAAgB,aAAa,CAAE,IAAY;IACzC,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;QACjE,gEAAgE;QAChE,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAEvD,MAAM,KAAK,GAAG,IAAA,cAAI,EAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAEjE,MAAM,QAAQ,GAAG,IAAI,GAAG,cAAc,EAAE,GAAG,GAAG,GAAG,QAAQ,EAAE,CAAA;IAC3D,uCAAuC;IACvC,IAAI,KAAK,CAAA;IACT,IAAI,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAClC,KAAK,GAAG,CAAC,YAAY,GAAG,KAAK,GAAG,cAAc,EAAE,GAAG,GAAG,GAAG,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IACvF,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,QAAQ,CAAA,CAAC,kCAAkC;IACrD,CAAC;IACD,oDAAoD;IACpD,OAAO,KAAK,CAAA;AACd,CAAC;AApBD,sCAoBC;AAED,SAAsB,YAAY;;QAChC,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,EAAS,CAAC,CAAA;QACvC,MAAM,OAAO,GAAQ,IAAI,qCAAwB,CAAC,EAAE,CAAC,CAAA;QACrD,MAAM,QAAQ,GAAQ,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAChD,OAAO,QAAQ,CAAC,OAAO,CAAA,CAAC,8BAA8B;IACxD,CAAC;CAAA;AALD,oCAKC"}