taon-typeorm 18.0.18 → 18.0.20

package/lib/typeorm/query-builder/relation-count/RelationCountLoader.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelationCountLoader = void 0;
-var tslib_1 = require("tslib");
-var RelationCountLoader = /** @class */ (function () {
+class RelationCountLoader {
+    connection;
+    queryRunner;
+    relationCountAttributes;
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function RelationCountLoader(connection, queryRunner, relationCountAttributes) {
+    constructor(connection, queryRunner, relationCountAttributes) {
         this.connection = connection;
         this.queryRunner = queryRunner;
         this.relationCountAttributes = relationCountAttributes;
@@ -14,176 +16,155 @@ var RelationCountLoader = /** @class */ (function () {
     // -------------------------------------------------------------------------
     // Public Methods
     // -------------------------------------------------------------------------
-    RelationCountLoader.prototype.load = function (rawEntities) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var onlyUnique, promises;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                onlyUnique = function (value, index, self) {
-                    return self.indexOf(value) === index;
+    async load(rawEntities) {
+        const onlyUnique = (value, index, self) => {
+            return self.indexOf(value) === index;
+        };
+        const promises = this.relationCountAttributes.map(async (relationCountAttr) => {
+            if (relationCountAttr.relation.isOneToMany) {
+                // example: Post and Category
+                // loadRelationCountAndMap("post.categoryCount", "post.categories")
+                // we expect it to load array of post ids
+                // todo(dima): fix issues wit multiple primary keys and remove joinColumns[0]
+                const relation = relationCountAttr.relation; // "category.posts"
+                const inverseRelation = relation.inverseRelation; // "post.category"
+                const referenceColumnName = inverseRelation.joinColumns[0].referencedColumn
+                    .propertyName; // post id
+                const inverseSideTable = relation.inverseEntityMetadata.target; // Post
+                const inverseSideTableName = relation.inverseEntityMetadata.tableName; // post
+                const inverseSideTableAlias = relationCountAttr.alias || inverseSideTableName; // if condition (custom query builder factory) is set then relationIdAttr.alias defined
+                const inverseSidePropertyName = inverseRelation.propertyName; // "category" from "post.category"
+                let referenceColumnValues = rawEntities
+                    .map((rawEntity) => rawEntity[relationCountAttr.parentAlias +
+                    "_" +
+                    referenceColumnName])
+                    .filter((value) => !!value);
+                referenceColumnValues =
+                    referenceColumnValues.filter(onlyUnique);
+                // ensure we won't perform redundant queries for joined data which was not found in selection
+                // example: if post.category was not found in db then no need to execute query for category.imageIds
+                if (referenceColumnValues.length === 0)
+                    return {
+                        relationCountAttribute: relationCountAttr,
+                        results: [],
+                    };
+                // generate query:
+                // SELECT category.post as parentId, COUNT(*) AS cnt FROM category category WHERE category.post IN (1, 2) GROUP BY category.post
+                const qb = this.connection.createQueryBuilder(this.queryRunner);
+                qb.select(inverseSideTableAlias + "." + inverseSidePropertyName, "parentId")
+                    .addSelect("COUNT(*)", "cnt")
+                    .from(inverseSideTable, inverseSideTableAlias)
+                    .where(inverseSideTableAlias +
+                    "." +
+                    inverseSidePropertyName +
+                    " IN (:...ids)")
+                    .addGroupBy(inverseSideTableAlias +
+                    "." +
+                    inverseSidePropertyName)
+                    .setParameter("ids", referenceColumnValues);
+                // apply condition (custom query builder factory)
+                if (relationCountAttr.queryBuilderFactory)
+                    relationCountAttr.queryBuilderFactory(qb);
+                return {
+                    relationCountAttribute: relationCountAttr,
+                    results: await qb.getRawMany(),
                 };
-                promises = this.relationCountAttributes.map(function (relationCountAttr) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                    var relation, inverseRelation, referenceColumnName_1, inverseSideTable, inverseSideTableName, inverseSideTableAlias, inverseSidePropertyName, referenceColumnValues, qb, joinTableColumnName_1, inverseJoinColumnName, firstJunctionColumn, secondJunctionColumn, referenceColumnValues, junctionAlias, inverseSideTableName, inverseSideTableAlias, junctionTableName, condition, qb;
-                    var _a, _b;
-                    return tslib_1.__generator(this, function (_c) {
-                        switch (_c.label) {
-                            case 0:
-                                if (!relationCountAttr.relation.isOneToMany) return [3 /*break*/, 2];
-                                relation = relationCountAttr.relation // "category.posts"
-                                ;
-                                inverseRelation = relation.inverseRelation // "post.category"
-                                ;
-                                referenceColumnName_1 = inverseRelation.joinColumns[0].referencedColumn
-                                    .propertyName // post id
-                                ;
-                                inverseSideTable = relation.inverseEntityMetadata.target // Post
-                                ;
-                                inverseSideTableName = relation.inverseEntityMetadata.tableName // post
-                                ;
-                                inverseSideTableAlias = relationCountAttr.alias || inverseSideTableName // if condition (custom query builder factory) is set then relationIdAttr.alias defined
-                                ;
-                                inverseSidePropertyName = inverseRelation.propertyName // "category" from "post.category"
-                                ;
-                                referenceColumnValues = rawEntities
-                                    .map(function (rawEntity) {
-                                    return rawEntity[relationCountAttr.parentAlias +
-                                        "_" +
-                                        referenceColumnName_1];
-                                })
-                                    .filter(function (value) { return !!value; });
-                                referenceColumnValues =
-                                    referenceColumnValues.filter(onlyUnique);
-                                // ensure we won't perform redundant queries for joined data which was not found in selection
-                                // example: if post.category was not found in db then no need to execute query for category.imageIds
-                                if (referenceColumnValues.length === 0)
-                                    return [2 /*return*/, {
-                                            relationCountAttribute: relationCountAttr,
-                                            results: [],
-                                        }
-                                        // generate query:
-                                        // SELECT category.post as parentId, COUNT(*) AS cnt FROM category category WHERE category.post IN (1, 2) GROUP BY category.post
-                                    ];
-                                qb = this.connection.createQueryBuilder(this.queryRunner);
-                                qb.select(inverseSideTableAlias + "." + inverseSidePropertyName, "parentId")
-                                    .addSelect("COUNT(*)", "cnt")
-                                    .from(inverseSideTable, inverseSideTableAlias)
-                                    .where(inverseSideTableAlias +
-                                    "." +
-                                    inverseSidePropertyName +
-                                    " IN (:...ids)")
-                                    .addGroupBy(inverseSideTableAlias +
-                                    "." +
-                                    inverseSidePropertyName)
-                                    .setParameter("ids", referenceColumnValues);
-                                // apply condition (custom query builder factory)
-                                if (relationCountAttr.queryBuilderFactory)
-                                    relationCountAttr.queryBuilderFactory(qb);
-                                _a = {
-                                    relationCountAttribute: relationCountAttr
-                                };
-                                return [4 /*yield*/, qb.getRawMany()];
-                            case 1: return [2 /*return*/, (_a.results = _c.sent(),
-                                    _a)];
-                            case 2:
-                                inverseJoinColumnName = void 0;
-                                firstJunctionColumn = void 0;
-                                secondJunctionColumn = void 0;
-                                if (relationCountAttr.relation.isOwning) {
-                                    // todo fix joinColumns[0] and inverseJoinColumns[0].
-                                    joinTableColumnName_1 =
-                                        relationCountAttr.relation.joinColumns[0]
-                                            .referencedColumn.databaseName;
-                                    inverseJoinColumnName =
-                                        relationCountAttr.relation.inverseJoinColumns[0]
-                                            .referencedColumn.databaseName;
-                                    firstJunctionColumn =
-                                        relationCountAttr.relation.junctionEntityMetadata
-                                            .columns[0];
-                                    secondJunctionColumn =
-                                        relationCountAttr.relation.junctionEntityMetadata
-                                            .columns[1];
-                                }
-                                else {
-                                    joinTableColumnName_1 =
-                                        relationCountAttr.relation.inverseRelation
-                                            .inverseJoinColumns[0].referencedColumn
-                                            .databaseName;
-                                    inverseJoinColumnName =
-                                        relationCountAttr.relation.inverseRelation
-                                            .joinColumns[0].referencedColumn.databaseName;
-                                    firstJunctionColumn =
-                                        relationCountAttr.relation.junctionEntityMetadata
-                                            .columns[1];
-                                    secondJunctionColumn =
-                                        relationCountAttr.relation.junctionEntityMetadata
-                                            .columns[0];
-                                }
-                                referenceColumnValues = rawEntities
-                                    .map(function (rawEntity) {
-                                    return rawEntity[relationCountAttr.parentAlias +
-                                        "_" +
-                                        joinTableColumnName_1];
-                                })
-                                    .filter(function (value) { return !!value; });
-                                referenceColumnValues =
-                                    referenceColumnValues.filter(onlyUnique);
-                                // ensure we won't perform redundant queries for joined data which was not found in selection
-                                // example: if post.category was not found in db then no need to execute query for category.imageIds
-                                if (referenceColumnValues.length === 0)
-                                    return [2 /*return*/, {
-                                            relationCountAttribute: relationCountAttr,
-                                            results: [],
-                                        }];
-                                junctionAlias = relationCountAttr.junctionAlias;
-                                inverseSideTableName = relationCountAttr.joinInverseSideMetadata.tableName;
-                                inverseSideTableAlias = relationCountAttr.alias || inverseSideTableName;
-                                junctionTableName = relationCountAttr.relation.junctionEntityMetadata
-                                    .tableName;
-                                condition = junctionAlias +
-                                    "." +
-                                    firstJunctionColumn.propertyName +
-                                    " IN (" +
-                                    referenceColumnValues.map(function (vals) {
-                                        return isNaN(vals) ? "'" + vals + "'" : vals;
-                                    }) +
-                                    ")" +
-                                    " AND " +
-                                    junctionAlias +
-                                    "." +
-                                    secondJunctionColumn.propertyName +
-                                    " = " +
-                                    inverseSideTableAlias +
-                                    "." +
-                                    inverseJoinColumnName;
-                                qb = this.connection.createQueryBuilder(this.queryRunner);
-                                qb.select(junctionAlias + "." + firstJunctionColumn.propertyName, "parentId")
-                                    .addSelect("COUNT(" +
-                                    qb.escape(inverseSideTableAlias) +
-                                    "." +
-                                    qb.escape(inverseJoinColumnName) +
-                                    ")", "cnt")
-                                    .from(inverseSideTableName, inverseSideTableAlias)
-                                    .innerJoin(junctionTableName, junctionAlias, condition)
-                                    .addGroupBy(junctionAlias +
-                                    "." +
-                                    firstJunctionColumn.propertyName);
-                                // apply condition (custom query builder factory)
-                                if (relationCountAttr.queryBuilderFactory)
-                                    relationCountAttr.queryBuilderFactory(qb);
-                                _b = {
-                                    relationCountAttribute: relationCountAttr
-                                };
-                                return [4 /*yield*/, qb.getRawMany()];
-                            case 3: return [2 /*return*/, (_b.results = _c.sent(),
-                                    _b)];
-                        }
-                    });
-                }); });
-                return [2 /*return*/, Promise.all(promises)];
-            });
+            }
+            else {
+                // example: Post and Category
+                // owner side: loadRelationIdAndMap("post.categoryIds", "post.categories")
+                // inverse side: loadRelationIdAndMap("category.postIds", "category.posts")
+                // we expect it to load array of post ids
+                let joinTableColumnName;
+                let inverseJoinColumnName;
+                let firstJunctionColumn;
+                let secondJunctionColumn;
+                if (relationCountAttr.relation.isOwning) {
+                    // todo fix joinColumns[0] and inverseJoinColumns[0].
+                    joinTableColumnName =
+                        relationCountAttr.relation.joinColumns[0]
+                            .referencedColumn.databaseName;
+                    inverseJoinColumnName =
+                        relationCountAttr.relation.inverseJoinColumns[0]
+                            .referencedColumn.databaseName;
+                    firstJunctionColumn =
+                        relationCountAttr.relation.junctionEntityMetadata
+                            .columns[0];
+                    secondJunctionColumn =
+                        relationCountAttr.relation.junctionEntityMetadata
+                            .columns[1];
+                }
+                else {
+                    joinTableColumnName =
+                        relationCountAttr.relation.inverseRelation
+                            .inverseJoinColumns[0].referencedColumn
+                            .databaseName;
+                    inverseJoinColumnName =
+                        relationCountAttr.relation.inverseRelation
+                            .joinColumns[0].referencedColumn.databaseName;
+                    firstJunctionColumn =
+                        relationCountAttr.relation.junctionEntityMetadata
+                            .columns[1];
+                    secondJunctionColumn =
+                        relationCountAttr.relation.junctionEntityMetadata
+                            .columns[0];
+                }
+                let referenceColumnValues = rawEntities
+                    .map((rawEntity) => rawEntity[relationCountAttr.parentAlias +
+                    "_" +
+                    joinTableColumnName])
+                    .filter((value) => !!value);
+                referenceColumnValues =
+                    referenceColumnValues.filter(onlyUnique);
+                // ensure we won't perform redundant queries for joined data which was not found in selection
+                // example: if post.category was not found in db then no need to execute query for category.imageIds
+                if (referenceColumnValues.length === 0)
+                    return {
+                        relationCountAttribute: relationCountAttr,
+                        results: [],
+                    };
+                const junctionAlias = relationCountAttr.junctionAlias;
+                const inverseSideTableName = relationCountAttr.joinInverseSideMetadata.tableName;
+                const inverseSideTableAlias = relationCountAttr.alias || inverseSideTableName;
+                const junctionTableName = relationCountAttr.relation.junctionEntityMetadata
+                    .tableName;
+                const condition = junctionAlias +
+                    "." +
+                    firstJunctionColumn.propertyName +
+                    " IN (" +
+                    referenceColumnValues.map((vals) => isNaN(vals) ? "'" + vals + "'" : vals) +
+                    ")" +
+                    " AND " +
+                    junctionAlias +
+                    "." +
+                    secondJunctionColumn.propertyName +
+                    " = " +
+                    inverseSideTableAlias +
+                    "." +
+                    inverseJoinColumnName;
+                const qb = this.connection.createQueryBuilder(this.queryRunner);
+                qb.select(junctionAlias + "." + firstJunctionColumn.propertyName, "parentId")
+                    .addSelect("COUNT(" +
+                    qb.escape(inverseSideTableAlias) +
+                    "." +
+                    qb.escape(inverseJoinColumnName) +
+                    ")", "cnt")
+                    .from(inverseSideTableName, inverseSideTableAlias)
+                    .innerJoin(junctionTableName, junctionAlias, condition)
+                    .addGroupBy(junctionAlias +
+                    "." +
+                    firstJunctionColumn.propertyName);
+                // apply condition (custom query builder factory)
+                if (relationCountAttr.queryBuilderFactory)
+                    relationCountAttr.queryBuilderFactory(qb);
+                return {
+                    relationCountAttribute: relationCountAttr,
+                    results: await qb.getRawMany(),
+                };
+            }
         });
-    };
-    return RelationCountLoader;
-}());
+        return Promise.all(promises);
+    }
+}
 exports.RelationCountLoader = RelationCountLoader;
 //# sourceMappingURL=RelationCountLoader.js.map

package/lib/typeorm/query-builder/relation-count/RelationCountLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"RelationCountLoader.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}
+{"version":3,"file":"RelationCountLoader.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-typeorm/src/lib/typeorm/query-builder/relation-count/RelationCountLoader.ts"],"names":[],"mappings":"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"}

package/lib/typeorm/query-builder/relation-count/RelationCountMetadataToAttributeTransformer.js

@@ -1,18 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RelationCountMetadataToAttributeTransformer = void 0;
-var RelationCountAttribute_1 = require("./RelationCountAttribute");
-var RelationCountMetadataToAttributeTransformer = /** @class */ (function () {
+const RelationCountAttribute_1 = require("./RelationCountAttribute");
+class RelationCountMetadataToAttributeTransformer {
+    expressionMap;
     // -------------------------------------------------------------------------
     // Constructor
     // -------------------------------------------------------------------------
-    function RelationCountMetadataToAttributeTransformer(expressionMap) {
+    constructor(expressionMap) {
         this.expressionMap = expressionMap;
     }
     // -------------------------------------------------------------------------
     // Public Methods
     // -------------------------------------------------------------------------
-    RelationCountMetadataToAttributeTransformer.prototype.transform = function () {
+    transform() {
         // by example:
         // post has relation count:
         // @RelationCount(post => post.categories) categoryCount
@@ -20,37 +21,35 @@ var RelationCountMetadataToAttributeTransformer = /** @class */ (function () {
         // @RelationCount(category => category.images) imageCount
         // we load post and join category
         // we expect post.categoryCount and post.category.imageCount to have relation counts
-        var _this = this;
         // first create relation count attributes for all relation count metadatas of the main selected object (post from example)
         if (this.expressionMap.mainAlias) {
-            this.expressionMap.mainAlias.metadata.relationCounts.forEach(function (relationCount) {
-                var attribute = _this.metadataToAttribute(_this.expressionMap.mainAlias.name, relationCount);
-                _this.expressionMap.relationCountAttributes.push(attribute);
+            this.expressionMap.mainAlias.metadata.relationCounts.forEach((relationCount) => {
+                const attribute = this.metadataToAttribute(this.expressionMap.mainAlias.name, relationCount);
+                this.expressionMap.relationCountAttributes.push(attribute);
             });
         }
         // second create relation count attributes for all relation count metadatas of all joined objects (category from example)
-        this.expressionMap.joinAttributes.forEach(function (join) {
+        this.expressionMap.joinAttributes.forEach((join) => {
             // ensure this join has a metadata, because relation count can only work for real orm entities
             if (!join.metadata || join.metadata.isJunction)
                 return;
-            join.metadata.relationCounts.forEach(function (relationCount) {
-                var attribute = _this.metadataToAttribute(join.alias.name, relationCount);
-                _this.expressionMap.relationCountAttributes.push(attribute);
+            join.metadata.relationCounts.forEach((relationCount) => {
+                const attribute = this.metadataToAttribute(join.alias.name, relationCount);
+                this.expressionMap.relationCountAttributes.push(attribute);
             });
         });
-    };
+    }
     // -------------------------------------------------------------------------
     // Private Methods
     // -------------------------------------------------------------------------
-    RelationCountMetadataToAttributeTransformer.prototype.metadataToAttribute = function (parentAliasName, relationCount) {
+    metadataToAttribute(parentAliasName, relationCount) {
         return new RelationCountAttribute_1.RelationCountAttribute(this.expressionMap, {
             relationName: parentAliasName + "." + relationCount.relation.propertyName, // category.images
             mapToProperty: parentAliasName + "." + relationCount.propertyName, // category.imageIds
             alias: relationCount.alias,
             queryBuilderFactory: relationCount.queryBuilderFactory,
         });
-    };
-    return RelationCountMetadataToAttributeTransformer;
-}());
+    }
+}
 exports.RelationCountMetadataToAttributeTransformer = RelationCountMetadataToAttributeTransformer;
 //# sourceMappingURL=RelationCountMetadataToAttributeTransformer.js.map

package/lib/typeorm/query-builder/relation-count/RelationCountMetadataToAttributeTransformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"RelationCountMetadataToAttributeTransformer.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAEA,mEAAiE;AAEjE;IACI,4EAA4E;IAC5E,cAAc;IACd,4EAA4E;IAE5E,qDAAsB,aAAiC;QAAjC,kBAAa,GAAb,aAAa,CAAoB;IAAG,CAAC;IAE3D,4EAA4E;IAC5E,iBAAiB;IACjB,4EAA4E;IAE5E,+DAAS,GAAT;QACI,cAAc;QACd,2BAA2B;QAC3B,wDAAwD;QACxD,8BAA8B;QAC9B,yDAAyD;QACzD,iCAAiC;QACjC,oFAAoF;QAPxF,iBAmCC;QA1BG,0HAA0H;QAC1H,IAAI,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CACxD,UAAC,aAAa;gBACV,IAAM,SAAS,GAAG,KAAI,CAAC,mBAAmB,CACtC,KAAI,CAAC,aAAa,CAAC,SAAU,CAAC,IAAI,EAClC,aAAa,CAChB,CAAA;gBACD,KAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC9D,CAAC,CACJ,CAAA;QACL,CAAC;QAED,yHAAyH;QACzH,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC,UAAC,IAAI;YAC3C,8FAA8F;YAC9F,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU;gBAAE,OAAM;YAEtD,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,UAAC,aAAa;gBAC/C,IAAM,SAAS,GAAG,KAAI,CAAC,mBAAmB,CACtC,IAAI,CAAC,KAAK,CAAC,IAAI,EACf,aAAa,CAChB,CAAA;gBACD,KAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC9D,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAED,4EAA4E;IAC5E,kBAAkB;IAClB,4EAA4E;IAEpE,yEAAmB,GAA3B,UACI,eAAuB,EACvB,aAAoC;QAEpC,OAAO,IAAI,+CAAsB,CAAC,IAAI,CAAC,aAAa,EAAE;YAClD,YAAY,EACR,eAAe,GAAG,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,YAAY,EAAE,kBAAkB;YACnF,aAAa,EAAE,eAAe,GAAG,GAAG,GAAG,aAAa,CAAC,YAAY,EAAE,oBAAoB;YACvF,KAAK,EAAE,aAAa,CAAC,KAAK;YAC1B,mBAAmB,EAAE,aAAa,CAAC,mBAAmB;SACzD,CAAC,CAAA;IACN,CAAC;IACL,kDAAC;AAAD,CAAC,AAhED,IAgEC;AAhEY,kGAA2C"}
+{"version":3,"file":"RelationCountMetadataToAttributeTransformer.js","sourceRoot":"","sources":["/Users/dfilipiak/projects/npm/taon-dev/taon-typeorm/src/lib/typeorm/query-builder/relation-count/RelationCountMetadataToAttributeTransformer.ts"],"names":[],"mappings":";;;AAEA,qEAAiE;AAEjE,MAAa,2CAA2C;IAK9B;IAJtB,4EAA4E;IAC5E,cAAc;IACd,4EAA4E;IAE5E,YAAsB,aAAiC;QAAjC,kBAAa,GAAb,aAAa,CAAoB;IAAG,CAAC;IAE3D,4EAA4E;IAC5E,iBAAiB;IACjB,4EAA4E;IAE5E,SAAS;QACL,cAAc;QACd,2BAA2B;QAC3B,wDAAwD;QACxD,8BAA8B;QAC9B,yDAAyD;QACzD,iCAAiC;QACjC,oFAAoF;QAEpF,0HAA0H;QAC1H,IAAI,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;YAC/B,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CACxD,CAAC,aAAa,EAAE,EAAE;gBACd,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CACtC,IAAI,CAAC,aAAa,CAAC,SAAU,CAAC,IAAI,EAClC,aAAa,CAChB,CAAA;gBACD,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC9D,CAAC,CACJ,CAAA;QACL,CAAC;QAED,yHAAyH;QACzH,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC/C,8FAA8F;YAC9F,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU;gBAAE,OAAM;YAEtD,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;gBACnD,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CACtC,IAAI,CAAC,KAAK,CAAC,IAAI,EACf,aAAa,CAChB,CAAA;gBACD,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC9D,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC;IAED,4EAA4E;IAC5E,kBAAkB;IAClB,4EAA4E;IAEpE,mBAAmB,CACvB,eAAuB,EACvB,aAAoC;QAEpC,OAAO,IAAI,+CAAsB,CAAC,IAAI,CAAC,aAAa,EAAE;YAClD,YAAY,EACR,eAAe,GAAG,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,YAAY,EAAE,kBAAkB;YACnF,aAAa,EAAE,eAAe,GAAG,GAAG,GAAG,aAAa,CAAC,YAAY,EAAE,oBAAoB;YACvF,KAAK,EAAE,aAAa,CAAC,KAAK;YAC1B,mBAAmB,EAAE,aAAa,CAAC,mBAAmB;SACzD,CAAC,CAAA;IACN,CAAC;CACJ;AAhED,kGAgEC"}