@toolsplus/nx-forge 6.1.3 → 6.1.5

package/src/shared/manifest/util-manifest.js

@@ -1,28 +1,96 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isResourceType = exports.resourceTypeByResourceDefinition = exports.getResourceTypeIndex = void 0;
-const manifest_1 = require("@forge/manifest");
 const devkit_1 = require("@nx/devkit");
 // https://stackoverflow.com/a/8511350/5115898
-const isObject = (v) => typeof v === 'object' && v !== null;
+const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
+const isModuleDefinitionWithKey = (m) => isObject(m) && 'key' in m && typeof m.key === 'string';
 /**
- * Determines the resource type based on the module definition.
+ * Adapted version of getAllModules from @forge/manifest that preserves the module type for each module and validates
+ * that each module definition is a record with a key property.
+ */
+const allModulesWithType = (modules) => Object.keys(modules).reduce((acc, moduleType) => [
+    ...acc,
+    ...modules[moduleType].reduce((innerAcc, m) => {
+        if (!isModuleDefinitionWithKey(m)) {
+            devkit_1.logger.warn(`Unexpected module definition for type ${moduleType}: Module is missing a 'key' property: ${JSON.stringify(m)}`);
+            return innerAcc;
+        }
+        return [
+            ...innerAcc,
+            {
+                type: moduleType,
+                definition: m,
+            },
+        ];
+    }, []),
+], []);
+/**
+ * Extracts the resource reference from the given module like definition if the
+ * definition is an object with a `resource` property.
  *
- * The criteria are as follows:
- * - UI Kit:    module has the `resource` property and the `render` property is
- *              `native`
- * - Custom UI: module has the `resource` property and the `render` property is
- *              not `native` or missing
- * - Static:    none of the above, consider it a static resource
+ * The resource type is determined as follows:
+ * - UI Kit: module has the `resource` property and the `render` property is `native`
+ * - Custom UI: module has the `resource` property, and the `render` property is not `native` or missing
  *
- * @param moduleDefinition Module definition to analyze
+ * @param moduleLikeDefinition
+ * @returns Resource reference if the definition is an object with a `resource` property, undefined otherwise.
  */
-const resourceTypeByModuleDefinition = (moduleDefinition) => {
-    if (!!moduleDefinition['resource'] && moduleDefinition['render'] === 'native')
-        return 'ui-kit';
-    if (!!moduleDefinition['resource'] && moduleDefinition['render'] !== 'native')
-        return 'custom-ui';
-    return 'static';
+const extractResourceFromModuleLike = (moduleLikeDefinition) => {
+    if (!isObject(moduleLikeDefinition) ||
+        typeof moduleLikeDefinition.resource !== 'string') {
+        return undefined;
+    }
+    const { resource, render } = moduleLikeDefinition;
+    return {
+        key: resource,
+        type: render === 'native' ? 'ui-kit' : 'custom-ui',
+    };
+};
+/**
+ * Searches at the root of the module definition for resource references.
+ * @param def Module definition to analyze
+ */
+const defaultExtractionStrategy = (def) => [def];
+/**
+ * Specialized resource reference extraction strategies for certain module types.
+ */
+const extractionStrategies = {
+    'jira:customField': (def) => {
+        return [
+            def === null || def === void 0 ? void 0 : def.view,
+            def === null || def === void 0 ? void 0 : def.edit,
+        ];
+    },
+    action: (def) => {
+        return [def === null || def === void 0 ? void 0 : def.config];
+    },
+};
+/**
+ * Extracts resource references from the given module definition indexed by the
+ * resource key.
+ *
+ * Note that some modules may not define resources at the root, so for certain
+ * module types, we need to look deeper into the definition to find potential
+ * resource references.
+ *
+ * The resource type is determined as follows:
+ * - UI Kit: module has the `resource` property and the `render` property is `native`
+ * - Custom UI: module has the `resource` property, and the `render` property is not `native` or missing
+ * - otherwise: assume there is no resource reference in the module definition
+ *
+ * @param type Module type, e.g. `jira:customField`
+ * @param definition Module definition to analyze
+ */
+const extractResourceReferencesFromModule = ({ type, definition, }) => {
+    var _a;
+    const getSearchInputs = (_a = extractionStrategies[type]) !== null && _a !== void 0 ? _a : defaultExtractionStrategy;
+    return getSearchInputs(definition).reduce((acc, m) => {
+        const resource = extractResourceFromModuleLike(m);
+        return resource === undefined
+            ? acc
+            : { ...acc, [resource.key]: resource };
+    }, {});
 };
 /**
  * Computes an index from resource key to resource type which is either `ui-kit`,
@@ -47,7 +115,7 @@ const getResourceTypeIndex = (manifestSchema) => (manifestSchema.resources || []
 }, {});
 exports.getResourceTypeIndex = getResourceTypeIndex;
 /**
- * Determines if type of the given resource.
+ * Determines the type of the given resource.
  *
  * The resource type is determined by the following reduction:
  *
@@ -55,33 +123,42 @@ exports.getResourceTypeIndex = getResourceTypeIndex;
  *   UI or UI Kit resource.
  * - If the resource key is referenced via resource string interpolation
  *   (resource:<resource-key>;) anywhere in the manifest, infer a static resource.
- * - Else infer Custom UI. These kind of resources are typically used as Modal
+ * - Else infer Custom UI. These kinds of resources are typically used as Modal
  *   dialogs in Custom UIs. They are not referenced in the manifest and instead,
  *   opened via @forge/bridge in Custom UI code.
  *
  * @see https://developer.atlassian.com/platform/forge/apis-reference/ui-api-bridge/modal/
  *
  * @param manifestSchema Complete manifest definition
- * @param resource Resource to resolve against the manifest definition
+ * @returns Function that takes the resource to resolve against the manifest definition
  */
 const resourceTypeByResourceDefinition = (manifestSchema) => {
+    var _a;
     const manifestSchemaString = JSON.stringify(manifestSchema);
-    return (resource) => {
-        var _a;
-        for (const moduleDefinition of (0, manifest_1.getAllModules)((_a = manifestSchema.modules) !== null && _a !== void 0 ? _a : {})) {
-            if (isObject(moduleDefinition) &&
-                Object.hasOwn(moduleDefinition, 'resource') &&
-                typeof moduleDefinition['resource'] === 'string' &&
-                moduleDefinition['resource'] === resource.key) {
-                return resourceTypeByModuleDefinition(moduleDefinition);
+    const modules = allModulesWithType((_a = manifestSchema.modules) !== null && _a !== void 0 ? _a : {});
+    const moduleResourceReferencesByResourceKey = modules.reduce((acc, module) => {
+        const resourceReferences = extractResourceReferencesFromModule(module);
+        for (const r of Object.values(resourceReferences)) {
+            if (r.key in acc && acc[r.key].type !== r.type) {
+                devkit_1.logger.warn(`nx-forge has already been inferred resource with key ${r.key} to a different type. The current module ${module.type}:${module.definition.key} inferred the type as ${r.type} but it was previously inferred as ${acc[r.key].type}. This may be a bug, please report it at https://github.com/toolsplus/nx-forge/issues including your Forge manifest.yml`);
             }
         }
+        return {
+            ...acc,
+            ...resourceReferences,
+        };
+    }, {});
+    return (resource) => {
+        const maybeResourceRef = moduleResourceReferencesByResourceKey[resource.key];
+        if (maybeResourceRef) {
+            return maybeResourceRef.type;
+        }
         // If the resource key is referenced in the manifest via a resource
         // string interpolation, assume it is a static resource
         if (manifestSchemaString.includes(`resource:${resource.key};`)) {
             return 'static';
         }
-        // Assume that the resource is a Custom UI. There may be resources which are
+        // Assume that the resource is a Custom UI. There may be resources that are
         // not directly referenced in the manifest. For example, UI Kit modal dialogs
         // can be referenced in other Custom UI projects and loaded via @forge/bridge.
         // https://developer.atlassian.com/platform/forge/apis-reference/ui-api-bridge/modal/
@@ -99,7 +176,7 @@ exports.resourceTypeByResourceDefinition = resourceTypeByResourceDefinition;
  *
  * @param manifestSchema Complete manifest definition
  * @param acceptedResourceTypes Allows to filer for specific resource types
- * @param resource Resource to resolve against the manifest definition
+ * @returns Function that takes a resource to resolve against the manifest definition
  */
 const isResourceType = (manifestSchema, acceptedResourceTypes) => (resource) => acceptedResourceTypes.includes((0, exports.resourceTypeByResourceDefinition)(manifestSchema)(resource));
 exports.isResourceType = isResourceType;

package/src/shared/manifest/util-manifest.js.map

@@ -1 +1 @@
-{"version":3,"file":"util-manifest.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/shared/manifest/util-manifest.ts"],"names":[],"mappings":";;;AAAA,8CAAgE;AAEhE,uCAAoC;AAEpC,8CAA8C;AAC9C,MAAM,QAAQ,GAAG,CAAC,CAAU,EAAe,EAAE,CAC3C,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,CAAC;AAItC;;;;;;;;;;;GAWG;AACH,MAAM,8BAA8B,GAAG,CACrC,gBAAwB,EACV,EAAE;IAChB,IAAI,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,KAAK,QAAQ;QAC3E,OAAO,QAAQ,CAAC;IAClB,IAAI,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,KAAK,QAAQ;QAC3E,OAAO,WAAW,CAAC;IACrB,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAGF;;;;;;;;GAQG;AACI,MAAM,oBAAoB,GAAG,CAClC,cAA8B,EACX,EAAE,CACrB,CAAC,cAAc,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;IACxD,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC;IACjC,MAAM,YAAY,GAChB,IAAA,wCAAgC,EAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC7D,MAAM,kBAAkB,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC;IAE5C,IAAI,kBAAkB,IAAI,kBAAkB,KAAK,YAAY,EAAE,CAAC;QAC9D,eAAM,CAAC,IAAI,CACT,2DAA2D,QAAQ,CAAC,GAAG,+BAA+B,YAAY,4CAA4C,kBAAkB,GAAG,CACpL,CAAC;IACJ,CAAC;IAED,OAAO;QACL,GAAG,GAAG;QACN,CAAC,WAAW,CAAC,EAAE,YAAY;KAC5B,CAAC;AACJ,CAAC,EAAE,EAAuB,CAAC,CAAC;AAnBjB,QAAA,oBAAoB,wBAmBH;AAE9B;;;;;;;;;;;;;;;;;GAiBG;AACI,MAAM,gCAAgC,GAAG,CAC9C,cAA8B,EAC9B,EAAE;IACF,MAAM,oBAAoB,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC5D,OAAO,CAAC,QAA+B,EAAgB,EAAE;;QACvD,KAAK,MAAM,gBAAgB,IAAI,IAAA,wBAAa,EAC1C,MAAA,cAAc,CAAC,OAAO,mCAAI,EAAE,CAC7B,EAAE,CAAC;YACF,IACE,QAAQ,CAAC,gBAAgB,CAAC;gBAC1B,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,UAAU,CAAC;gBAC3C,OAAO,gBAAgB,CAAC,UAAU,CAAC,KAAK,QAAQ;gBAChD,gBAAgB,CAAC,UAAU,CAAC,KAAK,QAAQ,CAAC,GAAG,EAC7C,CAAC;gBACD,OAAO,8BAA8B,CAAC,gBAAgB,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QAED,mEAAmE;QACnE,uDAAuD;QACvD,IAAI,oBAAoB,CAAC,QAAQ,CAAC,YAAY,QAAQ,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC;YAC/D,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,4EAA4E;QAC5E,6EAA6E;QAC7E,8EAA8E;QAC9E,qFAAqF;QACrF,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,gCAAgC,oCA8B3C;AAEF;;;;;;;;;;;GAWG;AACI,MAAM,cAAc,GACzB,CAAC,cAA8B,EAAE,qBAAqC,EAAE,EAAE,CAC1E,CAAC,QAA+B,EAAW,EAAE,CAC3C,qBAAqB,CAAC,QAAQ,CAC5B,IAAA,wCAAgC,EAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,CAC3D,CAAC;AALO,QAAA,cAAc,kBAKrB"}
+{"version":3,"file":"util-manifest.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/shared/manifest/util-manifest.ts"],"names":[],"mappings":"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"}

package/src/utils/forge/yaml-validator.js

@@ -58,7 +58,7 @@ class YamlValidator {
                 success: false,
                 errors: [
                     {
-                        message: manifest_1.errors.invalidManifest(e.message),
+                        message: manifest_1.errors.invalidManifest(e instanceof Error ? e.message : String(e)),
                         reference: manifest_1.References.InvalidManifest,
                         level: 'error',
                         line: 0,

package/src/utils/forge/yaml-validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"yaml-validator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/utils/forge/yaml-validator.ts"],"names":[],"mappings":";;AAAA,8CAKyB;AACzB,qCAAuC;AACvC,+BAAiC;AAIjC;;;;;GAKG;AACH,MAAM,aAAa;IAGjB,YAAsB,OAAiC;QAAjC,YAAO,GAAP,OAAO,CAA0B;IAAG,CAAC;IAC3D,KAAK,CAAC,QAAQ,CACZ,QAAuC;;QAEvC,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,CAAA,EAAE,CAAC;YACxB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,cAAc,EAAE,QAAQ;aACzB,CAAC;QACJ,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACxD,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW;gBAC5C,CAAC,CAAC,IAAI,gCAAqB,EAAE,CAAC,iBAAiB,EAAE;gBACjD,CAAC,CAAC,IAAI,gCAAqB,EAAE,CAAC;YAChC,MAAM,eAAe,GAAG,aAAa;iBAClC,KAAK,EAAE;iBACP,aAAa,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3D,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,cAAc,EAAE;oBACd,QAAQ,EAAE,QAAQ,CAAC,QAAQ;oBAC3B,WAAW,EAAE,eAAe;oBAC5B,iBAAiB,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;iBACvC;aACF,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,gBAAS,EAAE,CAAC;gBAC3B,MAAM,GAAG,GAAG,MAAA,CAAC,CAAC,OAAO,0CAAG,CAAC,CAAC,CAAC;gBAC3B,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE;wBACN;4BACE,OAAO,EAAE,iBAAM,CAAC,eAAe,CAC7B,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAC/C;4BACD,SAAS,EAAE,qBAAU,CAAC,eAAe;4BACrC,KAAK,EAAE,OAAO;4BACd,IAAI,EAAE,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,mCAAI,CAAC;4BACpB,MAAM,EAAE,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,GAAG,mCAAI,CAAC;yBACtB;qBACF;iBACF,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE;oBACN;wBACE,OAAO,EAAE,iBAAM,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC;wBAC1C,SAAS,EAAE,qBAAU,CAAC,eAAe;wBACrC,KAAK,EAAE,OAAO;wBACd,IAAI,EAAE,CAAC;wBACP,MAAM,EAAE,CAAC;qBACV;iBACF;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AACD,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"yaml-validator.js","sourceRoot":"","sources":["../../../../../../packages/nx-forge/src/utils/forge/yaml-validator.ts"],"names":[],"mappings":";;AAAA,8CAKyB;AACzB,qCAAuC;AACvC,+BAAiC;AAIjC;;;;;GAKG;AACH,MAAM,aAAa;IAGjB,YAAsB,OAAiC;QAAjC,YAAO,GAAP,OAAO,CAA0B;IAAG,CAAC;IAC3D,KAAK,CAAC,QAAQ,CACZ,QAAuC;;QAEvC,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,CAAA,EAAE,CAAC;YACxB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,cAAc,EAAE,QAAQ;aACzB,CAAC;QACJ,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACxD,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW;gBAC5C,CAAC,CAAC,IAAI,gCAAqB,EAAE,CAAC,iBAAiB,EAAE;gBACjD,CAAC,CAAC,IAAI,gCAAqB,EAAE,CAAC;YAChC,MAAM,eAAe,GAAG,aAAa;iBAClC,KAAK,EAAE;iBACP,aAAa,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC3D,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,cAAc,EAAE;oBACd,QAAQ,EAAE,QAAQ,CAAC,QAAQ;oBAC3B,WAAW,EAAE,eAAe;oBAC5B,iBAAiB,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;iBACvC;aACF,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,gBAAS,EAAE,CAAC;gBAC3B,MAAM,GAAG,GAAG,MAAA,CAAC,CAAC,OAAO,0CAAG,CAAC,CAAC,CAAC;gBAC3B,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,MAAM,EAAE;wBACN;4BACE,OAAO,EAAE,iBAAM,CAAC,eAAe,CAC7B,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAC/C;4BACD,SAAS,EAAE,qBAAU,CAAC,eAAe;4BACrC,KAAK,EAAE,OAAO;4BACd,IAAI,EAAE,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,mCAAI,CAAC;4BACpB,MAAM,EAAE,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,GAAG,mCAAI,CAAC;yBACtB;qBACF;iBACF,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE;oBACN;wBACE,OAAO,EAAE,iBAAM,CAAC,eAAe,CAC7B,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAC3C;wBACD,SAAS,EAAE,qBAAU,CAAC,eAAe;wBACrC,KAAK,EAAE,OAAO;wBACd,IAAI,EAAE,CAAC;wBACP,MAAM,EAAE,CAAC;qBACV;iBACF;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AACD,kBAAe,aAAa,CAAC"}

package/src/utils/has-webpack-plugin.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 function hasWebpackPlugin(tree) {
     var _a;
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    return !!((_a = nxJson.plugins) === null || _a === void 0 ? void 0 : _a.some((p) => typeof p === 'string'
+    return !!((_a = nxJson === null || nxJson === void 0 ? void 0 : nxJson.plugins) === null || _a === void 0 ? void 0 : _a.some((p) => typeof p === 'string'
         ? p === '@nx/webpack/plugin'
         : p.plugin === '@nx/webpack/plugin'));
 }

package/src/utils/has-webpack-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"has-webpack-plugin.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/utils/has-webpack-plugin.ts"],"names":[],"mappings":";;AAEA,4CAOC;AATD,uCAA8C;AAE9C,SAAgB,gBAAgB,CAAC,IAAU;;IACzC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,OAAO,CAAC,CAAC,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAClC,OAAO,CAAC,KAAK,QAAQ;QACnB,CAAC,CAAC,CAAC,KAAK,oBAAoB;QAC5B,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,oBAAoB,CACtC,CAAA,CAAC;AACJ,CAAC"}
+{"version":3,"file":"has-webpack-plugin.js","sourceRoot":"","sources":["../../../../../packages/nx-forge/src/utils/has-webpack-plugin.ts"],"names":[],"mappings":";;AAEA,4CAOC;AATD,uCAA8C;AAE9C,SAAgB,gBAAgB,CAAC,IAAU;;IACzC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,OAAO,CAAC,CAAC,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACnC,OAAO,CAAC,KAAK,QAAQ;QACnB,CAAC,CAAC,CAAC,KAAK,oBAAoB;QAC5B,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,oBAAoB,CACtC,CAAA,CAAC;AACJ,CAAC"}