@loopback/repository 4.1.0 → 5.0.0

package/dist/relations/belongs-to/belongs-to.inclusion-resolver.js

@@ -5,6 +5,7 @@
 // License text available at https://opensource.org/licenses/MIT
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBelongsToInclusionResolver = void 0;
+const __1 = require("../../");
 const relation_helpers_1 = require("../relation.helpers");
 const belongs_to_helpers_1 = require("./belongs-to.helpers");
 /**
@@ -15,21 +16,93 @@ const belongs_to_helpers_1 = require("./belongs-to.helpers");
  * Notice: scope field for inclusion is not supported yet
  *
  * @param meta - resolved BelongsToMetadata
- * @param getTargetRepo - target repository i.e where related instances are
+ * @param getTargetRepoDict - dictionary of target model type - target repository
+ * i.e where related instances for different types are
  */
-function createBelongsToInclusionResolver(meta, getTargetRepo) {
+function createBelongsToInclusionResolver(meta, getTargetRepoDict) {
     const relationMeta = (0, belongs_to_helpers_1.resolveBelongsToMetadata)(meta);
-    return async function fetchIncludedModels(entities, inclusion, options) {
+    return async function fetchBelongsToModel(entities, inclusion, options) {
         if (!entities.length)
             return [];
+        // Source ids are grouped by their target polymorphic types
+        // Each type search for target instances and then merge together in a merge-sort-like manner
         const sourceKey = relationMeta.keyFrom;
-        const sourceIds = entities.map(e => e[sourceKey]);
         const targetKey = relationMeta.keyTo;
-        const dedupedSourceIds = (0, relation_helpers_1.deduplicate)(sourceIds);
+        const targetDiscriminator = relationMeta.polymorphic
+            ? relationMeta.polymorphic.discriminator
+            : undefined;
         const scope = typeof inclusion === 'string' ? {} : inclusion.scope;
-        const targetRepo = await getTargetRepo();
-        const targetsFound = await (0, relation_helpers_1.findByForeignKeys)(targetRepo, targetKey, dedupedSourceIds.filter(e => e), scope, options);
-        return (0, relation_helpers_1.flattenTargetsOfOneToOneRelation)(sourceIds, targetsFound, targetKey);
+        // sourceIds in {targetType -> sourceId}
+        const sourceIdsCategorized = {};
+        if (targetDiscriminator) {
+            entities.forEach((value, index, allEntites) => {
+                const concreteType = String(value[targetDiscriminator]);
+                if (!getTargetRepoDict[concreteType]) {
+                    throw new __1.InvalidPolymorphismError(concreteType, targetDiscriminator);
+                }
+                if (!sourceIdsCategorized[concreteType]) {
+                    sourceIdsCategorized[concreteType] = [];
+                }
+                sourceIdsCategorized[concreteType].push(value[sourceKey]);
+            });
+        }
+        else {
+            const concreteType = relationMeta.target().name;
+            if (!getTargetRepoDict[concreteType]) {
+                throw new __1.InvalidPolymorphismError(concreteType);
+            }
+            entities.forEach((value, index, allEntites) => {
+                if (!sourceIdsCategorized[concreteType]) {
+                    sourceIdsCategorized[concreteType] = [];
+                }
+                sourceIdsCategorized[concreteType].push(value[sourceKey]);
+            });
+        }
+        // Ensure targetKey is included otherwise flatten function cannot work
+        const changedTargetKeyField = (0, __1.includeFieldIfNot)(scope === null || scope === void 0 ? void 0 : scope.fields, targetKey);
+        let needToRemoveTargetKeyFieldLater = false;
+        if (changedTargetKeyField !== false) {
+            scope.fields = changedTargetKeyField;
+            needToRemoveTargetKeyFieldLater = true;
+        }
+        // Each sourceIds array with same target type extract target instances
+        const targetCategorized = {};
+        for (const k of Object.keys(sourceIdsCategorized)) {
+            const targetRepo = await getTargetRepoDict[k]();
+            const targetsFound = await (0, relation_helpers_1.findByForeignKeys)(targetRepo, targetKey, (0, relation_helpers_1.deduplicate)(sourceIdsCategorized[k]).filter(e => e), scope, options);
+            targetCategorized[k] = (0, relation_helpers_1.flattenTargetsOfOneToOneRelation)(sourceIdsCategorized[k], targetsFound, targetKey);
+            // Remove targetKey if should be excluded but included above
+            if (needToRemoveTargetKeyFieldLater) {
+                targetCategorized[k] = targetCategorized[k].map(e => {
+                    if (e) {
+                        delete e[targetKey];
+                    }
+                    return e;
+                });
+            }
+        }
+        // Merge
+        // Why the order is correct:
+        // e.g. target model 1 = a, target model 2 = b
+        // all entities: [S(a-1), S(a-2), S(b-3), S(a-4), S(b-5)]
+        // a-result: [a-1, a-2, a-4]
+        // b-result: [b-3, b-4]
+        // merged:
+        // entities[1]->a => targets: [a-1 from a-result.shift()]
+        // entities[2]->a => targets: [a-1, a-2 from a-result.shift()]
+        // entities[3]->b => targets: [a-1, a-2, b-3 from b-result.shift()]
+        // entities[4]->a => targets: [a-1, a-2, b-3, a-4 from a-result.shift()]
+        // entities[5]->b => targets: [a-1, a-2, b-3, a-4, b-5 from b-result.shift()]
+        if (targetDiscriminator) {
+            const allTargets = [];
+            entities.forEach((value, index, allEntites) => {
+                allTargets.push(targetCategorized[String(value[targetDiscriminator])].shift());
+            });
+            return allTargets;
+        }
+        else {
+            return targetCategorized[relationMeta.target().name];
+        }
     };
 }
 exports.createBelongsToInclusionResolver = createBelongsToInclusionResolver;

package/dist/relations/belongs-to/belongs-to.inclusion-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"belongs-to.inclusion-resolver.js","sourceRoot":"","sources":["../../../src/relations/belongs-to/belongs-to.inclusion-resolver.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,oCAAoC;AACpC,+CAA+C;AAC/C,gEAAgE;;;AAMhE,0DAK6B;AAM7B,6DAA8D;AAE9D;;;;;;;;;GASG;AACH,SAAgB,gCAAgC,CAK9C,IAAyB,EACzB,aAEC;IAED,MAAM,YAAY,GAAG,IAAA,6CAAwB,EAAC,IAAI,CAAC,CAAC;IAEpD,OAAO,KAAK,UAAU,mBAAmB,CACvC,QAAkB,EAClB,SAA0B,EAC1B,OAAiB;QAEjB,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAEhC,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC;QACvC,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAE,CAAe,CAAC,SAAS,CAAC,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,YAAY,CAAC,KAA4B,CAAC;QAC5D,MAAM,gBAAgB,GAAG,IAAA,8BAAW,EAAC,SAAS,CAAC,CAAC;QAEhD,MAAM,KAAK,GACT,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,SAAS,CAAC,KAAwB,CAAC;QAE3E,MAAM,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;QACzC,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAiB,EAC1C,UAAU,EACV,SAAS,EACT,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAC/B,KAAK,EACL,OAAO,CACR,CAAC;QAEF,OAAO,IAAA,mDAAgC,EAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;IAC9E,CAAC,CAAC;AACJ,CAAC;AAtCD,4EAsCC"}
+{"version":3,"file":"belongs-to.inclusion-resolver.js","sourceRoot":"","sources":["../../../src/relations/belongs-to/belongs-to.inclusion-resolver.ts"],"names":[],"mappings":"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"}

package/dist/relations/belongs-to/belongs-to.repository.d.ts

@@ -1,4 +1,5 @@
 import { Getter } from '@loopback/core';
+import { TypeResolver } from '../../';
 import { DataObject, Options } from '../../common-types';
 import { Entity } from '../../model';
 import { EntityCrudRepository } from '../../repositories';
@@ -9,20 +10,42 @@ export interface BelongsToRepository<Target extends Entity> {
     /**
      * Gets the target model instance
      * @param options
+     * options.polymorphicType - a string or a string array of polymorphic type names
+     * to specify which repositories should are expected to be searched
+     * It is highly recommended to contain this param especially for
+     * datasources using deplicated ids across tables
      * @returns A promise resolved with the target object or rejected
      * with an EntityNotFoundError when target model instance was not found.
      */
-    get(options?: Options): Promise<Target>;
+    get(options?: Options & {
+        polymorphicType?: string | string[];
+    }): Promise<Target>;
 }
 export declare class DefaultBelongsToRepository<TargetEntity extends Entity, TargetId, TargetRepository extends EntityCrudRepository<TargetEntity, TargetId>> implements BelongsToRepository<TargetEntity> {
-    getTargetRepository: Getter<TargetRepository>;
+    getTargetRepository: Getter<TargetRepository> | {
+        [repoType: string]: Getter<TargetRepository>;
+    };
     constraint: DataObject<TargetEntity>;
+    targetResolver: TypeResolver<Entity, typeof Entity>;
     /**
      * Constructor of DefaultBelongsToEntityCrudRepository
-     * @param getTargetRepository - the getter of the related target model repository instance
+     * @param getTargetRepository - either a dictionary of target model type - target repository instance
+     * or a single target repository instance
+     * e.g. if the target is of a non-polymorphic type "Student", put the studentRepositoryGetterInstance
+     * if the target is of a polymorphic type "Person" which can be either a "Student" or a "Teacher"
+     * then put "{Student: studentRepositoryGetterInstance, Teacher: teacherRepositoryGetterInstance}"
      * @param constraint - the key value pair representing foreign key name to constrain
      * the target repository instance
+     * @param targetResolver - () => Target to resolve the target class
+     * e.g. if the target is of type "Student", then put "() => Student"
      */
-    constructor(getTargetRepository: Getter<TargetRepository>, constraint: DataObject<TargetEntity>);
-    get(options?: Options): Promise<TargetEntity>;
+    constructor(getTargetRepository: Getter<TargetRepository> | {
+        [repoType: string]: Getter<TargetRepository>;
+    }, constraint: DataObject<TargetEntity>, targetResolver: TypeResolver<Entity, typeof Entity>);
+    getTargetRepositoryDict: {
+        [repoType: string]: Getter<TargetRepository>;
+    };
+    get(options?: Options & {
+        polymorphicType?: string | string[];
+    }): Promise<TargetEntity>;
 }

package/dist/relations/belongs-to/belongs-to.repository.js

@@ -5,28 +5,67 @@
 // License text available at https://opensource.org/licenses/MIT
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultBelongsToRepository = void 0;
-const errors_1 = require("../../errors");
+const lodash_1 = require("lodash");
+const __1 = require("../../");
 const repositories_1 = require("../../repositories");
 class DefaultBelongsToRepository {
     /**
      * Constructor of DefaultBelongsToEntityCrudRepository
-     * @param getTargetRepository - the getter of the related target model repository instance
+     * @param getTargetRepository - either a dictionary of target model type - target repository instance
+     * or a single target repository instance
+     * e.g. if the target is of a non-polymorphic type "Student", put the studentRepositoryGetterInstance
+     * if the target is of a polymorphic type "Person" which can be either a "Student" or a "Teacher"
+     * then put "{Student: studentRepositoryGetterInstance, Teacher: teacherRepositoryGetterInstance}"
      * @param constraint - the key value pair representing foreign key name to constrain
      * the target repository instance
+     * @param targetResolver - () => Target to resolve the target class
+     * e.g. if the target is of type "Student", then put "() => Student"
      */
-    constructor(getTargetRepository, constraint) {
+    constructor(getTargetRepository, constraint, targetResolver) {
         this.getTargetRepository = getTargetRepository;
         this.constraint = constraint;
+        this.targetResolver = targetResolver;
+        if (typeof getTargetRepository === 'function') {
+            this.getTargetRepositoryDict = {
+                [targetResolver().name]: getTargetRepository,
+            };
+        }
+        else {
+            this.getTargetRepositoryDict = getTargetRepository;
+        }
     }
     async get(options) {
-        const targetRepo = await this.getTargetRepository();
-        const result = await targetRepo.find((0, repositories_1.constrainFilter)(undefined, this.constraint), options);
-        if (!result.length) {
-            // We don't have a direct access to the foreign key value here :(
-            const id = 'constraint ' + JSON.stringify(this.constraint);
-            throw new errors_1.EntityNotFoundError(targetRepo.entityClass, id);
+        let polymorphicTypes = options === null || options === void 0 ? void 0 : options.polymorphicType;
+        let allKeys;
+        if (Object.keys(this.getTargetRepositoryDict).length <= 1) {
+            allKeys = Object.keys(this.getTargetRepositoryDict);
+        }
+        else if (!polymorphicTypes || polymorphicTypes.length === 0) {
+            console.warn('It is highly recommended to specify the polymorphicTypes param when using polymorphic types.');
+            allKeys = Object.keys(this.getTargetRepositoryDict);
+        }
+        else {
+            if (typeof polymorphicTypes === 'string') {
+                polymorphicTypes = [polymorphicTypes];
+            }
+            allKeys = [];
+            new Set(polymorphicTypes).forEach(element => {
+                if (Object.keys(this.getTargetRepositoryDict).includes(element)) {
+                    allKeys.push(element);
+                }
+            });
+        }
+        let result = [];
+        for (const key of allKeys) {
+            const targetRepository = await this.getTargetRepositoryDict[key]();
+            result = result.concat(await targetRepository.find((0, repositories_1.constrainFilter)(undefined, this.constraint), Object.assign((0, lodash_1.cloneDeep)(options !== null && options !== void 0 ? options : {}), { polymorphicType: key })));
+            if (result.length >= 1) {
+                return result[0];
+            }
         }
-        return result[0];
+        // We don't have a direct access to the foreign key value here :(
+        const id = 'constraint ' + JSON.stringify(this.constraint);
+        throw new __1.EntityNotFoundError(this.targetResolver().name, id);
     }
 }
 exports.DefaultBelongsToRepository = DefaultBelongsToRepository;

package/dist/relations/belongs-to/belongs-to.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"belongs-to.repository.js","sourceRoot":"","sources":["../../../src/relations/belongs-to/belongs-to.repository.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,oCAAoC;AACpC,+CAA+C;AAC/C,gEAAgE;;;AAIhE,yCAAiD;AAEjD,qDAAyE;AAezE,MAAa,0BAA0B;IAMrC;;;;;OAKG;IACH,YACS,mBAA6C,EAC7C,UAAoC;QADpC,wBAAmB,GAAnB,mBAAmB,CAA0B;QAC7C,eAAU,GAAV,UAAU,CAA0B;IAC1C,CAAC;IAEJ,KAAK,CAAC,GAAG,CAAC,OAAiB;QACzB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAClC,IAAA,8BAAe,EAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,EAC3C,OAAO,CACR,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,iEAAiE;YACjE,MAAM,EAAE,GAAG,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC3D,MAAM,IAAI,4BAAmB,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;SAC3D;QACD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;CACF;AA9BD,gEA8BC"}
+{"version":3,"file":"belongs-to.repository.js","sourceRoot":"","sources":["../../../src/relations/belongs-to/belongs-to.repository.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,oCAAoC;AACpC,+CAA+C;AAC/C,gEAAgE;;;AAGhE,mCAAiC;AACjC,8BAAyD;AAGzD,qDAAyE;AAoBzE,MAAa,0BAA0B;IAMrC;;;;;;;;;;;OAWG;IAEH,YACS,mBAIF,EACE,UAAoC,EACpC,cAAmD;QANnD,wBAAmB,GAAnB,mBAAmB,CAIrB;QACE,eAAU,GAAV,UAAU,CAA0B;QACpC,mBAAc,GAAd,cAAc,CAAqC;QAE1D,IAAI,OAAO,mBAAmB,KAAK,UAAU,EAAE;YAC7C,IAAI,CAAC,uBAAuB,GAAG;gBAC7B,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,EACrB,mBAA+C;aAClD,CAAC;SACH;aAAM;YACL,IAAI,CAAC,uBAAuB,GAAG,mBAE9B,CAAC;SACH;IACH,CAAC;IAMD,KAAK,CAAC,GAAG,CACP,OAAyD;QAEzD,IAAI,gBAAgB,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,CAAC;QAChD,IAAI,OAAiB,CAAC;QACtB,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE;YACzD,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;SACrD;aAAM,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7D,OAAO,CAAC,IAAI,CACV,8FAA8F,CAC/F,CAAC;YACF,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;SACrD;aAAM;YACL,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;gBACxC,gBAAgB,GAAG,CAAC,gBAAgB,CAAC,CAAC;aACvC;YACD,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,CAAC,gBAAiB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC3C,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;oBAC/D,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACvB;YACH,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,MAAM,GAAmB,EAAE,CAAC;QAChC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE;YACzB,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,EAAE,CAAC;YACnE,MAAM,GAAG,MAAM,CAAC,MAAM,CACpB,MAAM,gBAAgB,CAAC,IAAI,CACzB,IAAA,8BAAe,EAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,EAC3C,MAAM,CAAC,MAAM,CAAC,IAAA,kBAAS,EAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC,EAAE,EAAC,eAAe,EAAE,GAAG,EAAC,CAAC,CAChE,CACF,CAAC;YACF,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;gBACtB,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;aAClB;SACF;QACD,iEAAiE;QACjE,MAAM,EAAE,GAAG,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3D,MAAM,IAAI,uBAAmB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;CACF;AApFD,gEAoFC"}

package/dist/relations/belongs-to/index.js

@@ -5,8 +5,8 @@
 // License text available at https://opensource.org/licenses/MIT
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-(0, tslib_1.__exportStar)(require("./belongs-to.decorator"), exports);
-(0, tslib_1.__exportStar)(require("./belongs-to.repository"), exports);
-(0, tslib_1.__exportStar)(require("./belongs-to.accessor"), exports);
-(0, tslib_1.__exportStar)(require("./belongs-to.inclusion-resolver"), exports);
+tslib_1.__exportStar(require("./belongs-to.decorator"), exports);
+tslib_1.__exportStar(require("./belongs-to.repository"), exports);
+tslib_1.__exportStar(require("./belongs-to.accessor"), exports);
+tslib_1.__exportStar(require("./belongs-to.inclusion-resolver"), exports);
 //# sourceMappingURL=index.js.map

package/dist/relations/belongs-to/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/relations/belongs-to/index.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,oCAAoC;AACpC,+CAA+C;AAC/C,gEAAgE;;;AAEhE,sEAAuC;AACvC,uEAAwC;AACxC,qEAAsC;AACtC,+EAAgD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/relations/belongs-to/index.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,oCAAoC;AACpC,+CAA+C;AAC/C,gEAAgE;;;AAEhE,iEAAuC;AACvC,kEAAwC;AACxC,gEAAsC;AACtC,0EAAgD"}

package/dist/relations/has-many/has-many-through.helpers.d.ts

@@ -5,6 +5,9 @@ export declare type HasManyThroughResolvedDefinition = HasManyDefinition & {
     through: {
         keyTo: string;
         keyFrom: string;
+        polymorphic: false | {
+            discriminator: string;
+        };
     };
 };
 /**

package/dist/relations/has-many/has-many-through.helpers.js

@@ -6,7 +6,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveHasManyThroughMetadata = exports.createThroughConstraintFromTarget = exports.getTargetIdsFromTargetModels = exports.createThroughConstraintFromSource = exports.getTargetKeysFromThroughModels = exports.createTargetConstraintFromThrough = void 0;
 const tslib_1 = require("tslib");
-const debug_1 = (0, tslib_1.__importDefault)(require("debug"));
+const debug_1 = tslib_1.__importDefault(require("debug"));
 const lodash_1 = require("lodash");
 const __1 = require("../..");
 const has_many_helpers_1 = require("./has-many.helpers");
@@ -246,7 +246,10 @@ function resolveHasManyThroughMetadata(relationMeta) {
         relationMeta.through.keyFrom &&
         throughModelProperties[relationMeta.through.keyFrom] &&
         relationMeta.keyTo &&
-        targetModelProperties[relationMeta.keyTo]) {
+        targetModelProperties[relationMeta.keyTo] &&
+        (relationMeta.through.polymorphic === false ||
+            (typeof relationMeta.through.polymorphic === 'object' &&
+                relationMeta.through.polymorphic.discriminator.length > 0))) {
         // The explicit cast is needed because of a limitation of type inference
         return relationMeta;
     }
@@ -268,6 +271,26 @@ function resolveHasManyThroughMetadata(relationMeta) {
         const reason = `target model ${targetModel.modelName} does not have any primary key (id property)`;
         throw new __1.InvalidRelationError(reason, relationMeta);
     }
+    let throughPolymorphic;
+    if (relationMeta.through.polymorphic === undefined ||
+        relationMeta.through.polymorphic === false ||
+        !relationMeta.through.polymorphic) {
+        const polymorphicFalse = false;
+        throughPolymorphic = polymorphicFalse;
+    }
+    else {
+        if (relationMeta.through.polymorphic === true) {
+            const polymorphicObject = {
+                discriminator: (0, lodash_1.camelCase)(relationMeta.target().name + '_type'),
+            };
+            throughPolymorphic = polymorphicObject;
+        }
+        else {
+            const polymorphicObject = relationMeta.through
+                .polymorphic;
+            throughPolymorphic = polymorphicObject;
+        }
+    }
     return Object.assign(relationMeta, {
         keyTo: targetPrimaryKey,
         keyFrom: relationMeta.keyFrom,
@@ -275,6 +298,7 @@ function resolveHasManyThroughMetadata(relationMeta) {
             ...relationMeta.through,
             keyTo: targetFkName,
             keyFrom: sourceFkName,
+            polymorphic: throughPolymorphic,
         },
     });
 }

package/dist/relations/has-many/has-many-through.helpers.js.map

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

package/dist/relations/has-many/has-many-through.inclusion-resolver.d.ts

@@ -13,4 +13,6 @@ import { Getter, HasManyDefinition, InclusionResolver } from '../relation.types'
  * @param getTargetRepo - target repository getter i.e where target instances
  * are
  */
-export declare function createHasManyThroughInclusionResolver<Through extends Entity, ThroughID, ThroughRelations extends object, Target extends Entity, TargetID, TargetRelations extends object>(meta: HasManyDefinition, getThroughRepo: Getter<EntityCrudRepository<Through, ThroughID, ThroughRelations>>, getTargetRepo: Getter<EntityCrudRepository<Target, TargetID, TargetRelations>>): InclusionResolver<Entity, Target>;
+export declare function createHasManyThroughInclusionResolver<Through extends Entity, ThroughID, ThroughRelations extends object, Target extends Entity, TargetID, TargetRelations extends object>(meta: HasManyDefinition, getThroughRepo: Getter<EntityCrudRepository<Through, ThroughID, ThroughRelations>>, getTargetRepoDict: {
+    [repoType: string]: Getter<EntityCrudRepository<Target, TargetID, TargetRelations>>;
+}): InclusionResolver<Entity, Target>;

package/dist/relations/has-many/has-many-through.inclusion-resolver.js

@@ -6,9 +6,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHasManyThroughInclusionResolver = void 0;
 const tslib_1 = require("tslib");
-const debug_1 = (0, tslib_1.__importDefault)(require("debug"));
+const debug_1 = tslib_1.__importDefault(require("debug"));
+const __1 = require("../..");
 const relation_helpers_1 = require("../relation.helpers");
-const has_many_helpers_1 = require("./has-many.helpers");
+const has_many_through_helpers_1 = require("./has-many-through.helpers");
 const debug = (0, debug_1.default)('loopback:repository:relations:has-many-through:inclusion-resolver');
 /**
  * Creates InclusionResolver for HasManyThrough relation.
@@ -22,9 +23,12 @@ const debug = (0, debug_1.default)('loopback:repository:relations:has-many-throu
  * @param getTargetRepo - target repository getter i.e where target instances
  * are
  */
-function createHasManyThroughInclusionResolver(meta, getThroughRepo, getTargetRepo) {
-    const relationMeta = (0, has_many_helpers_1.resolveHasManyMetadata)(meta);
+function createHasManyThroughInclusionResolver(meta, getThroughRepo, getTargetRepoDict) {
+    const relationMeta = (0, has_many_through_helpers_1.resolveHasManyThroughMetadata)(meta);
     return async function fetchHasManyThroughModels(entities, inclusion, options) {
+        if (!relationMeta.through) {
+            throw new Error(`relationMeta.through must be defined on ${relationMeta}`);
+        }
         if (!entities.length)
             return [];
         debug('Fetching target models for entities:', entities);
@@ -46,32 +50,99 @@ function createHasManyThroughInclusionResolver(meta, getThroughRepo, getTargetRe
         });
         debug('sourceId types', sourceIds.map(i => typeof i));
         const throughRepo = await getThroughRepo();
-        const targetRepo = await getTargetRepo();
         // find through models
         const throughFound = await (0, relation_helpers_1.findByForeignKeys)(throughRepo, throughKeyFrom, sourceIds, {}, // scope will be applied at the target level
         options);
         const throughResult = (0, relation_helpers_1.flattenTargetsOfOneToManyRelation)(sourceIds, throughFound, throughKeyFrom);
-        const result = [];
         const scope = typeof inclusion === 'string' ? {} : inclusion.scope;
-        // convert from through entities to the target entities
-        for (const entityList of throughResult) {
-            if (entityList) {
-                // get target ids from the through entities by foreign key
-                const targetIds = entityList.map(entity => entity[throughKeyTo]);
-                // the explicit types and casts are needed
-                const targetEntityList = await (0, relation_helpers_1.findByForeignKeys)(targetRepo, targetKey, targetIds, scope, {
-                    ...options,
-                    isThroughModelInclude: true,
-                });
-                result.push(targetEntityList);
+        // whether the polymorphism is configured
+        const targetDiscriminator = relationMeta.through.polymorphic
+            ? relationMeta.through.polymorphic.discriminator
+            : undefined;
+        if (targetDiscriminator) {
+            // put through results into arrays based on the target polymorphic types
+            const throughArrayByTargetType = {};
+            for (const throughArray of throughResult) {
+                if (throughArray) {
+                    for (const throughItem of throughArray) {
+                        const targetType = String(throughItem[targetDiscriminator]);
+                        if (!getTargetRepoDict[targetType]) {
+                            throw new __1.InvalidPolymorphismError(targetType, String(targetDiscriminator));
+                        }
+                        if (!throughArrayByTargetType[targetType]) {
+                            throughArrayByTargetType[targetType] = [];
+                        }
+                        throughArrayByTargetType[targetType].push(throughItem);
+                    }
+                }
             }
-            else {
-                // no entities found, add undefined to results
-                result.push(entityList);
+            // get targets based on their polymorphic types
+            const targetOfTypes = {};
+            for (const targetType of Object.keys(throughArrayByTargetType)) {
+                const targetIds = throughArrayByTargetType[targetType].map(throughItem => throughItem[throughKeyTo]);
+                const targetRepo = await getTargetRepoDict[targetType]();
+                const targetEntityList = await (0, relation_helpers_1.findByForeignKeys)(targetRepo, targetKey, targetIds, scope, options);
+                targetOfTypes[targetType] = targetEntityList;
+            }
+            // put targets into arrays reflecting their throughs
+            // Why the order is correct:
+            // e.g. through model = T(target instance), target model 1 = a, target model 2 = b
+            // all entities: [S1, S2, S2]
+            // through-result: [[T(b-11), T(a-12), T(b-13), T(b-14)], [T(a-21), T(a-22), T(b-23)], [T(b-31), T(b-32), T(a-33)]]
+            // through-array-by-target-type: {a:[T(a-12), T(a-21), T(a-22), T(a-33)] b: [T(b-11), T(b-13), T(b-14), T(b-23), T(b-31), T(b-32)]}
+            // target-array-by-target-type: {a:[a-12, a-21, a-22, a-33] b: [b-11, b-13, b-14, b-23, b-31, b-32]}
+            // merged:
+            // through-result[0][0]->b => targets: [[b-11 from b.shift()]]
+            // through-result[0][1]->a => targets: [[b-11, a-12 from a.shift()]]
+            // through-result[0][2]->b => targets: [[b-11, a-12, b-13 from b.shift()]]
+            // through-result[0][3]->b => targets: [[b-11, a-12, b-13, b-14 from b.shift()]]
+            // through-result[1][0]->a => targets: [[b-11, a-12, b-13, b-14], [a-21, from a.shift()]]
+            // through-result[1][1]->a => targets: [[b-11, a-12, b-13, b-14], [a-21, a-22 from a.shift()]]
+            // through-result[1][2]->b => targets: [[b-11, a-12, b-13, b-14], [a-21, a-22, b-23 from b.shift()]]
+            // through-result[2][0]->b => targets: [[b-11, a-12, b-13, b-14], [a-21, a-22, b-23], [b-31, from b.shift()]]
+            // through-result[2][1]->b => targets: [[b-11, a-12, b-13, b-14], [a-21, a-22, b-23], [b-31, b-32 from b.shift()]]
+            // through-result[2][1]->b => targets: [[b-11, a-12, b-13, b-14], [a-21, a-22, b-23], [b-31, b-32, a-33 from a.shift()]]
+            const allTargetsOfThrough = [];
+            for (const throughArray of throughResult) {
+                if (throughArray && throughArray.length > 0) {
+                    const currentTargetThroughArray = [];
+                    for (const throughItem of throughArray) {
+                        const itemToAdd = targetOfTypes[String(throughItem[targetDiscriminator])].shift();
+                        if (itemToAdd) {
+                            currentTargetThroughArray.push(itemToAdd);
+                        }
+                    }
+                    allTargetsOfThrough.push(currentTargetThroughArray);
+                }
+                else {
+                    allTargetsOfThrough.push(undefined);
+                }
+            }
+            return allTargetsOfThrough;
+        }
+        else {
+            const targetRepo = await getTargetRepoDict[relationMeta.target().name]();
+            const result = [];
+            // convert from through entities to the target entities
+            for (const entityList of throughResult) {
+                if (entityList) {
+                    // get target ids from the through entities by foreign key
+                    const targetIds = entityList.map(entity => entity[throughKeyTo]);
+                    // the explicit types and casts are needed
+                    const targetEntityList = await (0, relation_helpers_1.findByForeignKeys)(targetRepo, targetKey, targetIds, scope, {
+                        ...options,
+                        isThroughModelInclude: true,
+                    });
+                    result.push(targetEntityList);
+                }
+                else {
+                    // no entities found, add undefined to results
+                    result.push(entityList);
+                }
             }
+            debug('fetchHasManyThroughModels result', result);
+            return result;
         }
-        debug('fetchHasManyThroughModels result', result);
-        return result;
     };
 }
 exports.createHasManyThroughInclusionResolver = createHasManyThroughInclusionResolver;

package/dist/relations/has-many/has-many-through.inclusion-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"has-many-through.inclusion-resolver.js","sourceRoot":"","sources":["../../../src/relations/has-many/has-many-through.inclusion-resolver.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,oCAAoC;AACpC,+CAA+C;AAC/C,gEAAgE;;;;AAGhE,+DAAiC;AAIjC,0DAI6B;AAE7B,yDAA0D;AAE1D,MAAM,KAAK,GAAG,IAAA,eAAY,EACxB,mEAAmE,CACpE,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,SAAgB,qCAAqC,CAQnD,IAAuB,EACvB,cAEC,EACD,aAEC;IAED,MAAM,YAAY,GAAG,IAAA,yCAAsB,EAAC,IAAI,CAAC,CAAC;IAElD,OAAO,KAAK,UAAU,yBAAyB,CAC7C,QAAkB,EAClB,SAA0B,EAC1B,OAAiB;QAEjB,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAEhC,KAAK,CAAC,sCAAsC,EAAE,QAAQ,CAAC,CAAC;QACxD,KAAK,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC;QAE1C,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC;QACvC,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAE,CAAe,CAAC,SAAS,CAAC,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,YAAY,CAAC,KAA4B,CAAC;QAC5D,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;YACzB,MAAM,IAAI,KAAK,CACb,2CAA2C,YAAY,EAAE,CAC1D,CAAC;SACH;QACD,MAAM,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,KAA6B,CAAC;QACxE,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,OAA+B,CAAC;QAE5E,KAAK,CAAC,aAAa,EAAE;YACnB,SAAS;YACT,SAAS;YACT,SAAS;YACT,YAAY;YACZ,cAAc;SACf,CAAC,CAAC;QAEH,KAAK,CACH,gBAAgB,EAChB,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAC7B,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;QAC3C,MAAM,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;QAEzC,sBAAsB;QACtB,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAiB,EAC1C,WAAW,EACX,cAAc,EACd,SAAS,EACT,EAAE,EAAE,4CAA4C;QAChD,OAAO,CACR,CAAC;QAEF,MAAM,aAAa,GAAG,IAAA,oDAAiC,EACrD,SAAS,EACT,YAAY,EACZ,cAAc,CACf,CAAC;QAEF,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,MAAM,KAAK,GACT,OAAO,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,SAAS,CAAC,KAAwB,CAAC;QAE3E,uDAAuD;QACvD,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE;YACtC,IAAI,UAAU,EAAE;gBACd,0DAA0D;gBAC1D,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;gBAEjE,0CAA0C;gBAC1C,MAAM,gBAAgB,GAAG,MAAM,IAAA,oCAAiB,EAI9C,UAAU,EAAE,SAAS,EAAE,SAA0B,EAAE,KAAK,EAAE;oBAC1D,GAAG,OAAO;oBACV,qBAAqB,EAAE,IAAI;iBAC5B,CAAC,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;aAC/B;iBAAM;gBACL,8CAA8C;gBAC9C,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACzB;SACF;QAED,KAAK,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAC;QAClD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC;AApGD,sFAoGC"}
+{"version":3,"file":"has-many-through.inclusion-resolver.js","sourceRoot":"","sources":["../../../src/relations/has-many/has-many-through.inclusion-resolver.ts"],"names":[],"mappings":"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"}

package/dist/relations/has-many/has-many-through.repository-factory.d.ts

@@ -14,4 +14,6 @@ export declare type HasManyThroughRepositoryFactory<TargetEntity extends Entity,
      */
     inclusionResolver: InclusionResolver<Entity, TargetEntity>;
 };
-export declare function createHasManyThroughRepositoryFactory<Target extends Entity, TargetID, Through extends Entity, ThroughID, SourceID>(relationMetadata: HasManyDefinition, targetRepositoryGetter: Getter<EntityCrudRepository<Target, TargetID>>, throughRepositoryGetter: Getter<EntityCrudRepository<Through, ThroughID>>): HasManyThroughRepositoryFactory<Target, TargetID, Through, SourceID>;
+export declare function createHasManyThroughRepositoryFactory<Target extends Entity, TargetID, Through extends Entity, ThroughID, SourceID>(relationMetadata: HasManyDefinition, targetRepositoryGetter: Getter<EntityCrudRepository<Target, TargetID>> | {
+    [repoType: string]: Getter<EntityCrudRepository<Target, TargetID>>;
+}, throughRepositoryGetter: Getter<EntityCrudRepository<Through, ThroughID>>): HasManyThroughRepositoryFactory<Target, TargetID, Through, SourceID>;

package/dist/relations/has-many/has-many-through.repository-factory.js

@@ -10,6 +10,12 @@ const has_many_through_inclusion_resolver_1 = require("./has-many-through.inclus
 const has_many_through_repository_1 = require("./has-many-through.repository");
 function createHasManyThroughRepositoryFactory(relationMetadata, targetRepositoryGetter, throughRepositoryGetter) {
     const meta = (0, has_many_through_helpers_1.resolveHasManyThroughMetadata)(relationMetadata);
+    // resolve the repositoryGetter into a dictionary
+    if (typeof targetRepositoryGetter === 'function') {
+        targetRepositoryGetter = {
+            [meta.target().name]: targetRepositoryGetter,
+        };
+    }
     const result = function (fkValue) {
         function getTargetConstraintFromThroughModels(throughInstances) {
             return (0, has_many_through_helpers_1.createTargetConstraintFromThrough)(meta, throughInstances);
@@ -28,7 +34,7 @@ function createHasManyThroughRepositoryFactory(relationMetadata, targetRepositor
             const constraint = (0, has_many_through_helpers_1.createThroughConstraintFromTarget)(meta, fkValues);
             return constraint;
         }
-        return new has_many_through_repository_1.DefaultHasManyThroughRepository(targetRepositoryGetter, throughRepositoryGetter, getTargetConstraintFromThroughModels, getTargetKeys, getThroughConstraintFromSource, getTargetIds, getThroughConstraintFromTarget);
+        return new has_many_through_repository_1.DefaultHasManyThroughRepository(targetRepositoryGetter, throughRepositoryGetter, getTargetConstraintFromThroughModels, getTargetKeys, getThroughConstraintFromSource, getTargetIds, getThroughConstraintFromTarget, relationMetadata.target, relationMetadata.through.model);
     };
     result.inclusionResolver = (0, has_many_through_inclusion_resolver_1.createHasManyThroughInclusionResolver)(meta, throughRepositoryGetter, targetRepositoryGetter);
     return result;

package/dist/relations/has-many/has-many-through.repository-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"has-many-through.repository-factory.js","sourceRoot":"","sources":["../../../src/relations/has-many/has-many-through.repository-factory.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,oCAAoC;AACpC,+CAA+C;AAC/C,gEAAgE;;;AAUhE,yEAOoC;AACpC,+FAA4F;AAC5F,+EAGuC;AA4BvC,SAAgB,qCAAqC,CAOnD,gBAAmC,EACnC,sBAAsE,EACtE,uBAAyE;IAEzE,MAAM,IAAI,GAAG,IAAA,wDAA6B,EAAC,gBAAgB,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,UAAU,OAAiB;QACxC,SAAS,oCAAoC,CAC3C,gBAA2B;YAE3B,OAAO,IAAA,4DAAiC,EACtC,IAAI,EACJ,gBAAgB,CACjB,CAAC;QACJ,CAAC;QACD,SAAS,aAAa,CAAC,gBAA2B;YAChD,OAAO,IAAA,yDAA8B,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAChE,CAAC;QACD,SAAS,8BAA8B;YACrC,MAAM,UAAU,GAAwB,IAAA,4DAAiC,EAGvE,IAAI,EAAE,OAAO,CAAC,CAAC;YACjB,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,SAAS,YAAY,CAAC,eAAyB;YAC7C,OAAO,IAAA,uDAA4B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAC7D,CAAC;QACD,SAAS,8BAA8B,CACrC,QAAoB;YAEpB,MAAM,UAAU,GAAwB,IAAA,4DAAiC,EAGvE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAClB,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,OAAO,IAAI,6DAA+B,CAQxC,sBAAsB,EACtB,uBAAuB,EACvB,oCAAoC,EACpC,aAAa,EACb,8BAA8B,EAC9B,YAAY,EACZ,8BAA8B,CAC/B,CAAC;IACJ,CAAC,CAAC;IACF,MAAM,CAAC,iBAAiB,GAAG,IAAA,2EAAqC,EAC9D,IAAI,EACJ,uBAAuB,EACvB,sBAAsB,CACvB,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAnED,sFAmEC"}
+{"version":3,"file":"has-many-through.repository-factory.js","sourceRoot":"","sources":["../../../src/relations/has-many/has-many-through.repository-factory.ts"],"names":[],"mappings":";AAAA,iDAAiD;AACjD,oCAAoC;AACpC,+CAA+C;AAC/C,gEAAgE;;;AAUhE,yEAOoC;AACpC,+FAA4F;AAC5F,+EAGuC;AA4BvC,SAAgB,qCAAqC,CAOnD,gBAAmC,EACnC,sBAIK,EACL,uBAAyE;IAEzE,MAAM,IAAI,GAAG,IAAA,wDAA6B,EAAC,gBAAgB,CAAC,CAAC;IAC7D,iDAAiD;IACjD,IAAI,OAAO,sBAAsB,KAAK,UAAU,EAAE;QAChD,sBAAsB,GAAG;YACvB,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,sBAErB;SACF,CAAC;KACH;IACD,MAAM,MAAM,GAAG,UAAU,OAAiB;QACxC,SAAS,oCAAoC,CAC3C,gBAA2B;YAE3B,OAAO,IAAA,4DAAiC,EACtC,IAAI,EACJ,gBAAgB,CACjB,CAAC;QACJ,CAAC;QACD,SAAS,aAAa,CAAC,gBAA2B;YAChD,OAAO,IAAA,yDAA8B,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QAChE,CAAC;QACD,SAAS,8BAA8B;YACrC,MAAM,UAAU,GAAwB,IAAA,4DAAiC,EAGvE,IAAI,EAAE,OAAO,CAAC,CAAC;YACjB,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,SAAS,YAAY,CAAC,eAAyB;YAC7C,OAAO,IAAA,uDAA4B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAC7D,CAAC;QACD,SAAS,8BAA8B,CACrC,QAAoB;YAEpB,MAAM,UAAU,GAAwB,IAAA,4DAAiC,EAGvE,IAAI,EAAE,QAAQ,CAAC,CAAC;YAClB,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,OAAO,IAAI,6DAA+B,CAQxC,sBAEC,EACD,uBAAuB,EACvB,oCAAoC,EACpC,aAAa,EACb,8BAA8B,EAC9B,YAAY,EACZ,8BAA8B,EAC9B,gBAAgB,CAAC,MAAM,EACvB,gBAAgB,CAAC,OAAQ,CAAC,KAAK,CAChC,CAAC;IACJ,CAAC,CAAC;IACF,MAAM,CAAC,iBAAiB,GAAG,IAAA,2EAAqC,EAC9D,IAAI,EACJ,uBAAuB,EACvB,sBAEC,CACF,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AArFD,sFAqFC"}