@payfit/nx-core 4.26.1 → 4.27.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payfit/nx-core",
-  "version": "4.26.1",
+  "version": "4.27.0",
   "type": "commonjs",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/executors/publisher/docker.js

@@ -32,25 +32,13 @@ async function publishDocker(options, context, version, projectRoot) {
     await (0, docker_1.buildDockerImage)(options.ecrRegistry, projectDockerfile, version, await (0, github_1.getSanitizedCurrentGitRepoUrl)(), await (0, github_1.getCurrentGitCommitSha)(), registry);
     logger_1.consola.success('Docker image built!');
     logger_1.consola.start('Pushing docker image');
-    const pushResult = await (0, docker_1.pushImageToEcr)(options.ecrRegistry, version, registry);
-    if (pushResult.exitCode !== 0) {
-        logger_1.consola.error(`Failed to push docker image to ECR registry ${registry}/${options.ecrRegistry} with version ${version} :\n ${pushResult.stderr}`);
-        return {
-            success: false,
-        };
-    }
+    await (0, docker_1.pushImageToEcr)(options.ecrRegistry, version, registry);
     logger_1.consola.success('Docker image pushed successfully!');
     // If the image is public, and the version is not ephemeral, we need to tag it as latest
     if (options.isPublicRegistry && !version.includes('ephemeral')) {
         logger_1.consola.start('Tagging docker image as latest');
         await (0, docker_1.tagLatestImage)(registry, options.ecrRegistry, version);
-        const tagResult = await (0, docker_1.pushImageToEcr)(options.ecrRegistry, 'latest', registry);
-        if (tagResult.exitCode !== 0) {
-            logger_1.consola.error(`Failed to tag docker image as latest in ECR registry ${registry}/${options.ecrRegistry} :\n ${tagResult.stderr}`);
-            return {
-                success: false,
-            };
-        }
+        await (0, docker_1.pushImageToEcr)(options.ecrRegistry, 'latest', registry);
         logger_1.consola.success('Docker image tagged as latest successfully!');
     }
     return {

package/src/executors/publisher/docker.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAkBA,sCAwFC;AA1GD,8BAA6B;AAI7B,mDAA+D;AAC/D,qDAA2D;AAC3D,+CAI2B;AAC3B,+CAG2B;AAC3B,+CAA4C;AAGrC,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB;IAInB,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,gBAAO,CAAC,IAAI,CAAC,2BAA2B,iBAAiB,gBAAgB,CAAC,CAAA;QAC1E,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAA;IACH,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzB,gBAAO,CAAC,KAAK,CACX,mGAAmG,CACpG,CAAA;QACD,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;IAED,mEAAmE;IACnE,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB;QACvC,CAAC,CAAC,+BAAmB;QACrB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAA;IAEhC,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,MAAM,IAAA,qBAAU,EAAC,QAAQ,CAAC,CAAA;IAE1B,gBAAO,CAAC,GAAG,CACT,8BAA8B,QAAQ,IAAI,OAAO,CAAC,WAAW,iBAAiB,OAAO,EAAE,CACxF,CAAA;IAED,gBAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;IACtC,MAAM,IAAA,yBAAgB,EACpB,OAAO,CAAC,WAAW,EACnB,iBAAiB,EACjB,OAAO,EACP,MAAM,IAAA,sCAA6B,GAAE,EACrC,MAAM,IAAA,+BAAsB,GAAE,EAC9B,QAAQ,CACT,CAAA;IACD,gBAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;IAEtC,gBAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,MAAM,UAAU,GAAG,MAAM,IAAA,uBAAc,EACrC,OAAO,CAAC,WAAW,EACnB,OAAO,EACP,QAAQ,CACT,CAAA;IAED,IAAI,UAAU,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC9B,gBAAO,CAAC,KAAK,CACX,+CAA+C,QAAQ,IAAI,OAAO,CAAC,WAAW,iBAAiB,OAAO,QAAQ,UAAU,CAAC,MAAM,EAAE,CAClI,CAAA;QACD,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;IACD,gBAAO,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAA;IAEpD,wFAAwF;IACxF,IAAI,OAAO,CAAC,gBAAgB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/D,gBAAO,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAC/C,MAAM,IAAA,uBAAc,EAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAC5D,MAAM,SAAS,GAAG,MAAM,IAAA,uBAAc,EACpC,OAAO,CAAC,WAAW,EACnB,QAAQ,EACR,QAAQ,CACT,CAAA;QACD,IAAI,SAAS,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC7B,gBAAO,CAAC,KAAK,CACX,wDAAwD,QAAQ,IAAI,OAAO,CAAC,WAAW,QAAQ,SAAS,CAAC,MAAM,EAAE,CAClH,CAAA;YACD,OAAO;gBACL,OAAO,EAAE,KAAK;aACf,CAAA;QACH,CAAC;QACD,gBAAO,CAAC,OAAO,CAAC,6CAA6C,CAAC,CAAA;IAChE,CAAC;IAED,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC"}
+{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAkBA,sCA+DC;AAjFD,8BAA6B;AAI7B,mDAA+D;AAC/D,qDAA2D;AAC3D,+CAI2B;AAC3B,+CAG2B;AAC3B,+CAA4C;AAGrC,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB;IAInB,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,gBAAO,CAAC,IAAI,CAAC,2BAA2B,iBAAiB,gBAAgB,CAAC,CAAA;QAC1E,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAA;IACH,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzB,gBAAO,CAAC,KAAK,CACX,mGAAmG,CACpG,CAAA;QACD,OAAO;YACL,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC;IAED,mEAAmE;IACnE,MAAM,QAAQ,GAAG,OAAO,CAAC,gBAAgB;QACvC,CAAC,CAAC,+BAAmB;QACrB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAA;IAEhC,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,MAAM,IAAA,qBAAU,EAAC,QAAQ,CAAC,CAAA;IAE1B,gBAAO,CAAC,GAAG,CACT,8BAA8B,QAAQ,IAAI,OAAO,CAAC,WAAW,iBAAiB,OAAO,EAAE,CACxF,CAAA;IAED,gBAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;IACtC,MAAM,IAAA,yBAAgB,EACpB,OAAO,CAAC,WAAW,EACnB,iBAAiB,EACjB,OAAO,EACP,MAAM,IAAA,sCAA6B,GAAE,EACrC,MAAM,IAAA,+BAAsB,GAAE,EAC9B,QAAQ,CACT,CAAA;IACD,gBAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;IAEtC,gBAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;IACrC,MAAM,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC5D,gBAAO,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAA;IAEpD,wFAAwF;IACxF,IAAI,OAAO,CAAC,gBAAgB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAC/D,gBAAO,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;QAC/C,MAAM,IAAA,uBAAc,EAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;QAC5D,MAAM,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC7D,gBAAO,CAAC,OAAO,CAAC,6CAA6C,CAAC,CAAA;IAChE,CAAC;IAED,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC"}

package/src/utils/docker.js

@@ -48,9 +48,11 @@ async function buildDockerImage(imageName, dockerfilePath, version, gitRepoUrl,
  * @returns A promise that resolves to the result of the push command
  */
 async function pushImageToEcr(repositoryName, version, registry) {
-    return (0, exec_1.exec)(`docker push ${registry}/${repositoryName}:${version}`);
+    const dockerOrPodman = await getDockerOrPodman();
+    return (0, exec_1.exec)(`${dockerOrPodman} push ${registry}/${repositoryName}:${version}`);
 }
 async function tagLatestImage(repositoryName, version, registry) {
-    return (0, exec_1.exec)(`docker tag ${registry}/${repositoryName}:${version} ${registry}/${repositoryName}:latest`);
+    const dockerOrPodman = await getDockerOrPodman();
+    return (0, exec_1.exec)(`${dockerOrPodman} tag ${registry}/${repositoryName}:${version} ${registry}/${repositoryName}:latest`);
 }
 //# sourceMappingURL=docker.js.map

package/src/utils/docker.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/docker.ts"],"names":[],"mappings":";;AAUA,8CAQC;AAaD,4CAkBC;AAUD,wCAMC;AAED,wCAQC;AAxED,iCAA6B;AAE7B;;;;GAIG;AACI,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC;QACH,MAAM,IAAA,WAAI,EAAC,kBAAkB,CAAC,CAAA;QAC9B,OAAO,QAAQ,CAAA;IACjB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;QAC9C,OAAO,QAAQ,CAAA;IACjB,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACI,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,cAAsB,EACtB,OAAe,EACf,UAAkB,EAClB,SAAiB,EACjB,QAAgB;IAEhB,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,WAAI,EACT,GAAG,cAAc,oBAAoB,QAAQ,IAAI,SAAS,IAAI,OAAO,OAAO,cAAc,yEAAyE,UAAU,mDAAmD,SAAS,sCAAsC,UAAU,kCAAkC,SAAS,EAAE,EACtU,IAAI,EACJ;QACE,WAAW,EAAE;YACX,KAAK,EAAE,SAAS;SACjB;KACF,CACF,CAAA;AACH,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,cAAc,CAClC,cAAsB,EACtB,OAAe,EACf,QAAgB;IAEhB,OAAO,IAAA,WAAI,EAAC,eAAe,QAAQ,IAAI,cAAc,IAAI,OAAO,EAAE,CAAC,CAAA;AACrE,CAAC;AAEM,KAAK,UAAU,cAAc,CAClC,cAAsB,EACtB,OAAe,EACf,QAAgB;IAEhB,OAAO,IAAA,WAAI,EACT,cAAc,QAAQ,IAAI,cAAc,IAAI,OAAO,IAAI,QAAQ,IAAI,cAAc,SAAS,CAC3F,CAAA;AACH,CAAC"}
+{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/docker.ts"],"names":[],"mappings":";;AASA,8CAQC;AAaD,4CAkBC;AAUD,wCAOC;AAED,wCASC;AA1ED,iCAA6B;AAE7B;;;;GAIG;AACI,KAAK,UAAU,iBAAiB;IACrC,IAAI,CAAC;QACH,MAAM,IAAA,WAAI,EAAC,kBAAkB,CAAC,CAAA;QAC9B,OAAO,QAAQ,CAAA;IACjB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;QAC9C,OAAO,QAAQ,CAAA;IACjB,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACI,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,cAAsB,EACtB,OAAe,EACf,UAAkB,EAClB,SAAiB,EACjB,QAAgB;IAEhB,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,WAAI,EACT,GAAG,cAAc,oBAAoB,QAAQ,IAAI,SAAS,IAAI,OAAO,OAAO,cAAc,yEAAyE,UAAU,mDAAmD,SAAS,sCAAsC,UAAU,kCAAkC,SAAS,EAAE,EACtU,IAAI,EACJ;QACE,WAAW,EAAE;YACX,KAAK,EAAE,SAAS;SACjB;KACF,CACF,CAAA;AACH,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,cAAc,CAClC,cAAsB,EACtB,OAAe,EACf,QAAgB;IAEhB,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,WAAI,EAAC,GAAG,cAAc,SAAS,QAAQ,IAAI,cAAc,IAAI,OAAO,EAAE,CAAC,CAAA;AAChF,CAAC;AAEM,KAAK,UAAU,cAAc,CAClC,cAAsB,EACtB,OAAe,EACf,QAAgB;IAEhB,MAAM,cAAc,GAAG,MAAM,iBAAiB,EAAE,CAAA;IAChD,OAAO,IAAA,WAAI,EACT,GAAG,cAAc,QAAQ,QAAQ,IAAI,cAAc,IAAI,OAAO,IAAI,QAAQ,IAAI,cAAc,SAAS,CACtG,CAAA;AACH,CAAC"}

package/src/utils/exec.d.ts

@@ -1,4 +1,4 @@
-import type { Options } from 'tinyexec';
-declare function execWrapperFromString(cmd: string, throwOnError?: boolean, options?: Partial<Options>): import("tinyexec").Result;
+import type { Options, Result } from 'tinyexec';
+declare function execWrapperFromString(cmd: string, throwOnError?: boolean, options?: Partial<Options>): Result;
 export declare const exec: typeof execWrapperFromString;
 export {};

package/src/utils/exec.js

@@ -3,21 +3,54 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.exec = void 0;
 const args_tokenizer_1 = require("args-tokenizer");
 const tinyexec_1 = require("tinyexec");
+const logger_1 = require("./logger");
 function createLoggingExecWrapper(execFn) {
     return (command, args = [], options = {}) => {
-        // consola.log(`Running '${command} ${args.join(' ')}'...`)
         return execFn(command, args, options);
     };
 }
 // Accepts a single string, splits it, and runs with logging
-function execWrapperFromString(cmd, throwOnError = true, options = {}) {
+function execWrapperFromString(cmd, throwOnError = false, options = {}) {
     const [command, ...args] = (0, args_tokenizer_1.tokenizeArgs)(cmd);
     // Remove throwOnError from options if present, to avoid conflicts
     const { throwOnError: _, ...restOptions } = options;
-    return createLoggingExecWrapper(tinyexec_1.x)(command, args, {
+    const wrappedExec = createLoggingExecWrapper(tinyexec_1.x);
+    // Set throwOnError to false to handle errors ourselves
+    const result = wrappedExec(command, args, {
         ...restOptions,
         throwOnError,
     });
+    // Add a then handler to check for errors
+    // Use .then() with both success and error handlers
+    const processedResult = result.then(
+    // Success handler
+    output => {
+        // Check if the command failed
+        if (output.exitCode !== 0) {
+            // Log the error to have it visible in the console
+            // Throw if requested
+            if (throwOnError) {
+                throw new Error(`Command '${cmd}' failed with exit code ${output.exitCode}:\n ${output.stderr}`);
+            }
+            else {
+                logger_1.consola.error(`Command '${cmd}' failed with exit code ${output.exitCode} :\n ${output.stderr}`);
+            }
+        }
+        return output;
+    }, 
+    // Error handler (instead of .catch())
+    error => {
+        // Don't log here to avoid double logging
+        if (throwOnError) {
+            throw error;
+        }
+        // If we don't throw, return a rejected promise with the error
+        return Promise.reject(error);
+    });
+    // Create a new object that combines the original result (for OutputApi methods)
+    // with the processed promise result (for then/catch behavior)
+    const combinedResult = Object.assign(Object.create(Object.getPrototypeOf(result)), result, { then: processedResult.then.bind(processedResult) });
+    return combinedResult;
 }
 exports.exec = execWrapperFromString;
 //# sourceMappingURL=exec.js.map

package/src/utils/exec.js.map

@@ -1 +1 @@
-{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/exec.ts"],"names":[],"mappings":";;;AAEA,mDAA6C;AAE7C,uCAA4B;AAE5B,SAAS,wBAAwB,CAAC,MAAgB;IAChD,OAAO,CACL,OAAe,EACf,OAAiB,EAAE,EACnB,UAA4B,EAAE,EAC9B,EAAE;QACF,2DAA2D;QAC3D,OAAO,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACvC,CAAC,CAAA;AACH,CAAC;AAED,4DAA4D;AAC5D,SAAS,qBAAqB,CAC5B,GAAW,EACX,YAAY,GAAG,IAAI,EACnB,UAA4B,EAAE;IAE9B,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAA;IAC5C,kEAAkE;IAClE,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,WAAW,EAAE,GAAG,OAAO,CAAA;IACnD,OAAO,wBAAwB,CAAC,YAAC,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE;QAChD,GAAG,WAAW;QACd,YAAY;KACb,CAAC,CAAA;AACJ,CAAC;AAEY,QAAA,IAAI,GAAG,qBAAqB,CAAA"}
+{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../../packages/nx-core/src/utils/exec.ts"],"names":[],"mappings":";;;AAEA,mDAA6C;AAC7C,uCAA4B;AAE5B,qCAAkC;AAElC,SAAS,wBAAwB,CAAC,MAAgB;IAChD,OAAO,CACL,OAAe,EACf,OAAiB,EAAE,EACnB,UAA4B,EAAE,EAC9B,EAAE;QACF,OAAO,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IACvC,CAAC,CAAA;AACH,CAAC;AAED,4DAA4D;AAC5D,SAAS,qBAAqB,CAC5B,GAAW,EACX,YAAY,GAAG,KAAK,EACpB,UAA4B,EAAE;IAE9B,MAAM,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,IAAA,6BAAY,EAAC,GAAG,CAAC,CAAA;IAC5C,kEAAkE;IAClE,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,WAAW,EAAE,GAAG,OAAO,CAAA;IAEnD,MAAM,WAAW,GAAG,wBAAwB,CAAC,YAAC,CAAC,CAAA;IAE/C,uDAAuD;IACvD,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE;QACxC,GAAG,WAAW;QACd,YAAY;KACb,CAAC,CAAA;IAEF,yCAAyC;IACzC,mDAAmD;IACnD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI;IACjC,kBAAkB;IAClB,MAAM,CAAC,EAAE;QACP,8BAA8B;QAC9B,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC1B,kDAAkD;YAClD,qBAAqB;YACrB,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CACb,YAAY,GAAG,2BAA2B,MAAM,CAAC,QAAQ,OAAO,MAAM,CAAC,MAAM,EAAE,CAChF,CAAA;YACH,CAAC;iBAAM,CAAC;gBACN,gBAAO,CAAC,KAAK,CACX,YAAY,GAAG,2BAA2B,MAAM,CAAC,QAAQ,QAAQ,MAAM,CAAC,MAAM,EAAE,CACjF,CAAA;YACH,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IACD,sCAAsC;IACtC,KAAK,CAAC,EAAE;QACN,yCAAyC;QACzC,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,KAAK,CAAA;QACb,CAAC;QAED,8DAA8D;QAC9D,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC,CACF,CAAA;IAED,gFAAgF;IAChF,8DAA8D;IAC9D,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAClC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EAC5C,MAAM,EACN,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CACrD,CAAA;IAED,OAAO,cAAwB,CAAA;AACjC,CAAC;AAEY,QAAA,IAAI,GAAG,qBAAqB,CAAA"}