dyna-record 0.1.5 → 0.2.1

package/dist/src/operations/Delete/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/operations/Delete/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,UAAU,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/operations/Delete/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;CACtB"}

package/dist/src/operations/FindById/FindById.d.ts

@@ -36,33 +36,12 @@ declare class FindById<T extends DynaRecord> extends OperationBase<T> {
      */
     private findByIdWithIncludes;
     /**
-     * Build the query to find the entity, and any of the BelongsToLinks for the included models
-     * @param id
-     * @param includedRelationships
-     * @returns
-     */
-    private buildFindByIdIncludesQuery;
-    /**
-     * Sort query results into an object containing:
-     *  - item: The FindById DynamoItem
-     *  - belongsToLinks: BelongsToLinkDynamoItem records for each of the included relationships
-     * @param queryResults
+     * Filters query results by parent entity and related entities for processing
+     * @param entityId - The id of the parent entity
+     * @param queryResults - The results of the query on the parent partition
      * @returns
      */
     private filterQueryResults;
-    private buildGetIncludedRelationshipsTransaction;
-    /**
-     * Builds transactions to get an associated entity via a BelongsToLink (HasOne or HasMany)
-     * @param belongsToLinks
-     * @param relationsLookup
-     */
-    private buildGetRelationshipsThroughLinksTransaction;
-    /**
-     * Builds transactions to get an associated entity using a foreign key on the parent model (BelongsTo)
-     * @param belongsToLinks
-     * @param relationsLookup
-     */
-    private buildGetRelationshipsThroughForeignKeyTransaction;
     /**
      * Get relationship metadata for the associations included in the query
      * @param includedAssociations
@@ -70,10 +49,10 @@ declare class FindById<T extends DynaRecord> extends OperationBase<T> {
      */
     private getIncludedRelationships;
     /**
-     * Serialize the FindById item to its class, serialize results from included relationships query onto the entity
-     * @param entityTableItem
-     * @param transactionResults
-     * @param relationsLookup
+     * Resolve query results into parent entity with included relationships
+     * @param parentEntity
+     * @param relatedEntities
+     * @param includedRelMeta
      * @returns
      */
     private resolveFindByIdIncludesResults;

package/dist/src/operations/FindById/FindById.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FindById.d.ts","sourceRoot":"","sources":["../../../../src/operations/FindById/FindById.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAW/C,OAAO,KAAK,EAIV,WAAW,EACX,QAAQ,EACT,MAAM,aAAa,CAAC;AASrB,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EAGpB,MAAM,SAAS,CAAC;AAQjB;;;;;;GAMG;AACH,cAAM,QAAQ,CAAC,CAAC,SAAS,UAAU,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC;;gBAG/C,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IAKlC;;;;;;;OAOG;IACU,GAAG,CACd,EAAE,EAAE,MAAM,EACV,OAAO,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAC3B,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAQpE;;;;OAIG;YACW,YAAY;IAmB1B;;;;;;OAMG;YACW,oBAAoB;IAiClC;;;;;OAKG;IACH,OAAO,CAAC,0BAA0B;IAkBlC;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;IAa1B,OAAO,CAAC,wCAAwC;IAehD;;;;OAIG;IACH,OAAO,CAAC,4CAA4C;IA6BpD;;;;OAIG;IACH,OAAO,CAAC,iDAAiD;IA0BzD;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAchC;;;;;;OAMG;IACH,OAAO,CAAC,8BAA8B;IAyCtC;;;;;;;OAOG;IACH,OAAO,CAAC,+BAA+B;CAexC;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"FindById.d.ts","sourceRoot":"","sources":["../../../../src/operations/FindById/FindById.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAI/C,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAsB,MAAM,aAAa,CAAC;AAE7E,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EACV,eAAe,EACf,mBAAmB,EAGpB,MAAM,SAAS,CAAC;AAQjB;;;;;;GAMG;AACH,cAAM,QAAQ,CAAC,CAAC,SAAS,UAAU,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC;;gBAG/C,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IAKlC;;;;;;;OAOG;IACU,GAAG,CACd,EAAE,EAAE,MAAM,EACV,OAAO,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAC3B,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAQpE;;;;OAIG;YACW,YAAY;IAmB1B;;;;;;OAMG;YACW,oBAAoB;IA4BlC;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAkB1B;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAchC;;;;;;OAMG;IACH,OAAO,CAAC,8BAA8B;IA0BtC;;;;;;;OAOG;IACH,OAAO,CAAC,+BAA+B;CAaxC;AAED,eAAe,QAAQ,CAAC"}

package/dist/src/operations/FindById/FindById.js

@@ -3,16 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const metadata_1 = __importDefault(require("../../metadata"));
-const dynamo_utils_1 = require("../../dynamo-utils");
-const query_utils_1 = require("../../query-utils");
 const Filters_1 = require("../../query-utils/Filters");
-const dynamo_utils_2 = require("../../dynamo-utils");
+const dynamo_utils_1 = require("../../dynamo-utils");
 const utils_1 = require("../../utils");
 const OperationBase_1 = __importDefault(require("../OperationBase"));
 const utils_2 = require("../utils");
 const utils_3 = require("../../metadata/utils");
-const Logger_1 = __importDefault(require("../../Logger"));
 /**
  * Facilitates the retrieval of an entity by its identifier (ID) from the database, potentially including its associated entities based on specified relationships.
  *
@@ -24,7 +20,7 @@ class FindById extends OperationBase_1.default {
     #transactionBuilder;
     constructor(Entity) {
         super(Entity);
-        this.#transactionBuilder = new dynamo_utils_2.TransactGetBuilder();
+        this.#transactionBuilder = new dynamo_utils_1.TransactGetBuilder();
     }
     /**
      * Find an entity by Id and optionally include associations
@@ -72,107 +68,34 @@ class FindById extends OperationBase_1.default {
      * @returns An entity with included associations serialized
      */
     async findByIdWithIncludes(id, includedAssociations) {
-        const includedRels = this.getIncludedRelationships(includedAssociations);
-        const params = this.buildFindByIdIncludesQuery(id, includedRels);
-        const queryResults = await dynamo_utils_1.DynamoClient.query({
-            ...params,
-            ConsistentRead: true
+        const includedRelMeta = this.getIncludedRelationships(includedAssociations);
+        const includedTypesFilter = (0, Filters_1.includedRelationshipsFilter)(this.EntityClass.name, includedRelMeta);
+        const queryResults = await this.EntityClass.query(id, {
+            filter: includedTypesFilter
         });
-        if (queryResults.length === 0) {
+        if (queryResults.length === 0)
             return undefined;
-        }
-        const sortedQueryResults = this.filterQueryResults(queryResults);
-        const relationsObj = (0, utils_2.buildEntityRelationshipMetaObj)(includedRels);
-        this.buildGetIncludedRelationshipsTransaction(sortedQueryResults, relationsObj);
-        const transactionRes = await this.#transactionBuilder.executeTransaction();
-        return this.resolveFindByIdIncludesResults(sortedQueryResults.item, transactionRes, relationsObj.relationsLookup);
+        const filtered = this.filterQueryResults(id, queryResults);
+        if (filtered.entity === undefined)
+            return;
+        return this.resolveFindByIdIncludesResults(filtered.entity, filtered.relatedEntities, includedRelMeta);
     }
     /**
-     * Build the query to find the entity, and any of the BelongsToLinks for the included models
-     * @param id
-     * @param includedRelationships
+     * Filters query results by parent entity and related entities for processing
+     * @param entityId - The id of the parent entity
+     * @param queryResults - The results of the query on the parent partition
      * @returns
      */
-    buildFindByIdIncludesQuery(id, includedRelationships) {
-        const modelPartitionKey = this.tableMetadata.partitionKeyAttribute.name;
-        const partitionFilter = (0, Filters_1.includedRelationshipsFilter)(this.EntityClass.name, includedRelationships);
-        return new query_utils_1.QueryBuilder({
-            entityClassName: this.EntityClass.name,
-            key: { [modelPartitionKey]: this.EntityClass.partitionKeyValue(id) },
-            options: { filter: partitionFilter }
-        }).build();
-    }
-    /**
-     * Sort query results into an object containing:
-     *  - item: The FindById DynamoItem
-     *  - belongsToLinks: BelongsToLinkDynamoItem records for each of the included relationships
-     * @param queryResults
-     * @returns
-     */
-    filterQueryResults(queryResults) {
+    filterQueryResults(entityId, queryResults) {
         return queryResults.reduce((acc, res) => {
-            const typeAlias = this.tableMetadata.defaultAttributes.type.alias;
-            if (res[typeAlias] === this.EntityClass.name)
-                acc.item = res;
-            if ((0, utils_1.isBelongsToLinkDynamoItem)(res, this.tableMetadata))
-                acc.belongsToLinks.push(res);
-            return acc;
-        }, { item: {}, belongsToLinks: [] });
-    }
-    buildGetIncludedRelationshipsTransaction(sortedQueryResults, relationsObj) {
-        this.buildGetRelationshipsThroughLinksTransaction(sortedQueryResults.belongsToLinks, relationsObj.relationsLookup);
-        this.buildGetRelationshipsThroughForeignKeyTransaction(sortedQueryResults.item, relationsObj.belongsToRelationships);
-    }
-    /**
-     * Builds transactions to get an associated entity via a BelongsToLink (HasOne or HasMany)
-     * @param belongsToLinks
-     * @param relationsLookup
-     */
-    buildGetRelationshipsThroughLinksTransaction(belongsToLinks, relationsLookup) {
-        const { name: tableName, defaultAttributes } = this.tableMetadata;
-        belongsToLinks.forEach(link => {
-            const foreignKey = link[defaultAttributes.foreignKey.alias];
-            const foreignEntityType = link[defaultAttributes.foreignEntityType.alias];
-            if ((0, utils_1.isPropertyKey)(foreignEntityType) && (0, utils_1.isString)(foreignKey)) {
-                const rel = relationsLookup[foreignEntityType];
-                this.#transactionBuilder.addGet({
-                    TableName: tableName,
-                    Key: {
-                        [this.partitionKeyAlias]: rel.target.partitionKeyValue(foreignKey),
-                        [this.sortKeyAlias]: rel.target.name
-                    }
-                });
+            if (entityId === res.id) {
+                acc.entity = res;
             }
             else {
-                Logger_1.default.error(
-                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                `Corrupted foreign key value. Invalid type. ${foreignEntityType} - ${foreignKey}`);
+                acc.relatedEntities.push(res);
             }
-        });
-    }
-    /**
-     * Builds transactions to get an associated entity using a foreign key on the parent model (BelongsTo)
-     * @param belongsToLinks
-     * @param relationsLookup
-     */
-    buildGetRelationshipsThroughForeignKeyTransaction(item, belongsToRelationships) {
-        if (belongsToRelationships.length > 0) {
-            const { name: tableName } = this.tableMetadata;
-            const attributes = metadata_1.default.getEntityAttributes(this.EntityClass.name);
-            belongsToRelationships.forEach(rel => {
-                const foreignKeyTableAlias = attributes[rel.foreignKey].alias;
-                const foreignKeyVal = item[foreignKeyTableAlias];
-                if (foreignKeyVal === undefined)
-                    return;
-                this.#transactionBuilder.addGet({
-                    TableName: tableName,
-                    Key: {
-                        [this.partitionKeyAlias]: rel.target.partitionKeyValue(foreignKeyVal),
-                        [this.sortKeyAlias]: rel.target.name
-                    }
-                });
-            });
-        }
+            return acc;
+        }, { entity: undefined, relatedEntities: [] });
     }
     /**
      * Get relationship metadata for the associations included in the query
@@ -189,35 +112,25 @@ class FindById extends OperationBase_1.default {
         }, []);
     }
     /**
-     * Serialize the FindById item to its class, serialize results from included relationships query onto the entity
-     * @param entityTableItem
-     * @param transactionResults
-     * @param relationsLookup
+     * Resolve query results into parent entity with included relationships
+     * @param parentEntity
+     * @param relatedEntities
+     * @param includedRelMeta
      * @returns
      */
-    resolveFindByIdIncludesResults(entityTableItem, transactionResults, relationsLookup) {
-        const parentEntity = (0, utils_1.tableItemToEntity)(this.EntityClass, entityTableItem);
-        const typeAlias = this.tableMetadata.defaultAttributes.type.alias;
+    resolveFindByIdIncludesResults(parentEntity, relatedEntities, includedRelMeta) {
+        const { relationsLookup } = (0, utils_2.buildEntityRelationshipMetaObj)(includedRelMeta);
         this.setIncludedRelationshipDefaults(parentEntity, relationsLookup);
-        transactionResults.forEach(res => {
-            const tableItem = res.Item;
-            if (tableItem !== undefined) {
-                const rel = relationsLookup[tableItem[typeAlias]];
-                if ((0, utils_1.isKeyOfEntity)(parentEntity, rel.propertyName)) {
-                    if (rel.type === "HasMany" || rel.type === "HasAndBelongsToMany") {
-                        const entity = (0, utils_1.tableItemToEntity)(rel.target, tableItem);
-                        const entities = parentEntity[rel.propertyName] ?? [];
-                        if (Array.isArray(entities)) {
-                            entities.push(entity);
-                        }
-                        Object.assign(parentEntity, { [rel.propertyName]: entities });
-                    }
-                    else {
-                        Object.assign(parentEntity, {
-                            [rel.propertyName]: (0, utils_1.tableItemToEntity)(rel.target, tableItem)
-                        });
-                    }
-                }
+        relatedEntities.forEach(entity => {
+            const rel = relationsLookup[entity.type];
+            if (rel.type === "HasMany" || rel.type === "HasAndBelongsToMany") {
+                const entities = parentEntity[rel.propertyName];
+                if (Array.isArray(entities))
+                    entities.push(entity);
+                Object.assign(parentEntity, { [rel.propertyName]: entities });
+            }
+            else {
+                Object.assign(parentEntity, { [rel.propertyName]: entity });
             }
         });
         return parentEntity;
@@ -232,8 +145,6 @@ class FindById extends OperationBase_1.default {
      */
     setIncludedRelationshipDefaults(parentEntity, relationsLookup) {
         Object.values(relationsLookup).forEach(rel => {
-            if (!(0, utils_1.isKeyOfEntity)(parentEntity, rel.propertyName))
-                return;
             if ((0, utils_3.isHasManyRelationship)(rel) ||
                 (0, utils_3.isHasAndBelongsToManyRelationship)(rel)) {
                 (0, utils_1.safeAssign)(parentEntity, rel.propertyName, []);

package/dist/src/operations/FindById/types.d.ts

@@ -1,7 +1,6 @@
-import type { QueryItems } from "../../dynamo-utils";
 import type DynaRecord from "../../DynaRecord";
-import type { EntityAttributes, FunctionFields, RelationshipAttributeNames } from "../types";
-import type { BelongsToLinkDynamoItem } from "../../types";
+import type { EntityAttributesOnly, FunctionFields, RelationshipAttributeNames } from "../types";
+import { type QueryResult, type QueryResults } from "../Query";
 /**
  * Defines options for the `FindById` operation, allowing specification of additional associations to include in the query result.
  *
@@ -21,14 +20,14 @@ export interface FindByIdOptions<T extends DynaRecord> {
  */
 export type IncludedAssociations<T extends DynaRecord> = NonNullable<FindByIdOptions<T>["include"]>;
 /**
- * Describes the structure of query results, sorting them into the main entity item and any associated `BelongsToLink` items. Used during processing
+ * Describes the structure of query results, sorting them into the main entity item and any associated items. Used during processing
  *
  * @property {QueryItems[number]} item - The main entity item retrieved from the query.
- * @property {BelongsToLinkDynamoItem[]} belongsToLinks - An array of `BelongsToLinkDynamoItem` instances associated with the main entity item.
+ * @property {QueryItems[]} relatedEntities - An array of `denormalized records` instances associated with the main entity item.
  */
 export interface SortedQueryResults {
-    item: QueryItems[number];
-    belongsToLinks: BelongsToLinkDynamoItem[];
+    entity?: QueryResult<DynaRecord>;
+    relatedEntities: QueryResults<DynaRecord>;
 }
 /**
  * Derives the keys of included associations from `FindByIdOptions`, representing the names of relationships specified to be included in the query result.
@@ -44,7 +43,7 @@ type IncludedKeys<T extends DynaRecord, Opts extends FindByIdOptions<T>> = Opts
  * @template P - The properties of the entity `T`.
  */
 type EntityKeysWithIncludedAssociations<T extends DynaRecord, P extends keyof T> = {
-    [K in P]: T[K] extends DynaRecord ? EntityAttributes<T> : T[K] extends DynaRecord[] ? Array<EntityAttributes<T[K][number]>> : T[K];
+    [K in P]: T[K] extends DynaRecord ? EntityAttributesOnly<T> : T[K] extends DynaRecord[] ? Array<EntityAttributesOnly<T[K][number]>> : T[K];
 };
 /**
  * Represents the result of a `FindById` operation, including the main entity and any specified associated entities.
@@ -52,6 +51,6 @@ type EntityKeysWithIncludedAssociations<T extends DynaRecord, P extends keyof T>
  * @template T - The type of the main entity, extending `DynaRecord`.
  * @template Opts - The options for the `FindById` operation, specifying included associations.
  */
-export type FindByIdIncludesRes<T extends DynaRecord, Opts extends FindByIdOptions<T>> = EntityKeysWithIncludedAssociations<T, keyof EntityAttributes<T> | IncludedKeys<T, Opts> | FunctionFields<T>>;
+export type FindByIdIncludesRes<T extends DynaRecord, Opts extends FindByIdOptions<T>> = EntityKeysWithIncludedAssociations<T, keyof EntityAttributesOnly<T> | IncludedKeys<T, Opts> | FunctionFields<T>>;
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/src/operations/FindById/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/operations/FindById/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EACV,gBAAgB,EAChB,cAAc,EACd,0BAA0B,EAC3B,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAE3D;;;;;;GAMG;AACH,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,UAAU;IACnD,OAAO,CAAC,EAAE,KAAK,CAAC;QAAE,WAAW,EAAE,0BAA0B,CAAC,CAAC,CAAC,CAAA;KAAE,CAAC,CAAC;CACjE;AAED;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,UAAU,IAAI,WAAW,CAClE,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAC9B,CAAC;AAEF;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IACzB,cAAc,EAAE,uBAAuB,EAAE,CAAC;CAC3C;AAED;;;;;GAKG;AACH,KAAK,YAAY,CAAC,CAAC,SAAS,UAAU,EAAE,IAAI,SAAS,eAAe,CAAC,CAAC,CAAC,IACrE,IAAI,SAAS,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,GACrC,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,GACxD,KAAK,CAAC;AAEZ;;;;;GAKG;AACH,KAAK,kCAAkC,CACrC,CAAC,SAAS,UAAU,EACpB,CAAC,SAAS,MAAM,CAAC,IACf;KACD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,GAC7B,gBAAgB,CAAC,CAAC,CAAC,GACnB,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,EAAE,GACvB,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GACrC,CAAC,CAAC,CAAC,CAAC;CACX,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,CAC7B,CAAC,SAAS,UAAU,EACpB,IAAI,SAAS,eAAe,CAAC,CAAC,CAAC,IAC7B,kCAAkC,CACpC,CAAC,EACD,MAAM,gBAAgB,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CACtE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/operations/FindById/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EACV,oBAAoB,EACpB,cAAc,EACd,0BAA0B,EAC3B,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,UAAU,CAAC;AAE/D;;;;;;GAMG;AACH,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,UAAU;IACnD,OAAO,CAAC,EAAE,KAAK,CAAC;QAAE,WAAW,EAAE,0BAA0B,CAAC,CAAC,CAAC,CAAA;KAAE,CAAC,CAAC;CACjE;AAED;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,UAAU,IAAI,WAAW,CAClE,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAC9B,CAAC;AAEF;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACjC,eAAe,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;CAC3C;AAED;;;;;GAKG;AACH,KAAK,YAAY,CAAC,CAAC,SAAS,UAAU,EAAE,IAAI,SAAS,eAAe,CAAC,CAAC,CAAC,IACrE,IAAI,SAAS,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,GACrC,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,GACxD,KAAK,CAAC;AAEZ;;;;;GAKG;AACH,KAAK,kCAAkC,CACrC,CAAC,SAAS,UAAU,EACpB,CAAC,SAAS,MAAM,CAAC,IACf;KACD,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,GAC7B,oBAAoB,CAAC,CAAC,CAAC,GACvB,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,EAAE,GACvB,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GACzC,CAAC,CAAC,CAAC,CAAC;CACX,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,CAC7B,CAAC,SAAS,UAAU,EACpB,IAAI,SAAS,eAAe,CAAC,CAAC,CAAC,IAC7B,kCAAkC,CACpC,CAAC,EACD,MAAM,oBAAoB,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAC1E,CAAC"}

package/dist/src/operations/Query/Query.d.ts

@@ -14,7 +14,7 @@ declare class Query<T extends DynaRecord> extends OperationBase<T> {
      * Run the query operation
      * @param key EntityId or object with PartitionKey and optional SortKey conditions
      * @param options Filter conditions, indexName, or SortKey conditions if querying by keys
-     * @returns Array of Entity or BelongsToLinks
+     * @returns Array of Entity or denormalized records
      */
     run(key: string | EntityKeyConditions<T>, options?: QueryBuilderOptions | Omit<QueryOptions, "indexName">): Promise<QueryResults<T>>;
     /**
@@ -40,6 +40,7 @@ declare class Query<T extends DynaRecord> extends OperationBase<T> {
      * @returns
      */
     private resolveQueryResults;
+    private tableItemToLinkedEntity;
 }
 export default Query;
 //# sourceMappingURL=Query.d.ts.map

package/dist/src/operations/Query/Query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../../../src/operations/Query/Query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAEL,KAAK,YAAY,IAAI,mBAAmB,EACzC,MAAM,mBAAmB,CAAC;AAQ3B,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE/E;;;;;;GAMG;AACH,cAAM,KAAK,CAAC,CAAC,SAAS,UAAU,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC;IACxD;;;;;OAKG;IACU,GAAG,CACd,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAC,CAAC,CAAC,EACpC,OAAO,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,GAC9D,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAQ3B;;;;;;OAMG;YACW,UAAU;IAexB;;;;;;;OAOG;YACW,WAAW;IAyBzB;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;CAS5B;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../../../src/operations/Query/Query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAEL,KAAK,YAAY,IAAI,mBAAmB,EACzC,MAAM,mBAAmB,CAAC;AAI3B,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EAEZ,YAAY,EACb,MAAM,SAAS,CAAC;AAEjB;;;;;;GAMG;AACH,cAAM,KAAK,CAAC,CAAC,SAAS,UAAU,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC;IACxD;;;;;OAKG;IACU,GAAG,CACd,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAC,CAAC,CAAC,EACpC,OAAO,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,GAC9D,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAQ3B;;;;;;OAMG;YACW,UAAU;IAexB;;;;;;;OAOG;YACW,WAAW;IAyBzB;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,uBAAuB;CAchC;AAED,eAAe,KAAK,CAAC"}

package/dist/src/operations/Query/Query.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const metadata_1 = __importDefault(require("../../metadata"));
 const query_utils_1 = require("../../query-utils");
 const DynamoClient_1 = __importDefault(require("../../dynamo-utils/DynamoClient"));
 const utils_1 = require("../../utils");
@@ -19,7 +20,7 @@ class Query extends OperationBase_1.default {
      * Run the query operation
      * @param key EntityId or object with PartitionKey and optional SortKey conditions
      * @param options Filter conditions, indexName, or SortKey conditions if querying by keys
-     * @returns Array of Entity or BelongsToLinks
+     * @returns Array of Entity or denormalized records
      */
     async run(key, options) {
         if (typeof key === "string") {
@@ -76,9 +77,21 @@ class Query extends OperationBase_1.default {
      * @returns
      */
     resolveQueryResults(queryResults) {
-        return queryResults.map(res => (0, utils_1.isBelongsToLinkDynamoItem)(res, this.tableMetadata)
-            ? (0, utils_1.tableItemToBelongsToLink)(this.tableMetadata, res)
-            : (0, utils_1.tableItemToEntity)(this.EntityClass, res));
+        const typeAlias = this.tableMetadata.defaultAttributes.type.alias;
+        return queryResults.map(res => res[typeAlias] === this.EntityClass.name
+            ? (0, utils_1.tableItemToEntity)(this.EntityClass, res)
+            : this.tableItemToLinkedEntity(res));
+    }
+    tableItemToLinkedEntity(tableItem) {
+        const typeAlias = this.tableMetadata.defaultAttributes.type.alias;
+        const entityName = tableItem[typeAlias];
+        if ((0, utils_1.isString)(entityName)) {
+            const entityMeta = metadata_1.default.getEntity(entityName);
+            return (0, utils_1.tableItemToEntity)(entityMeta.EntityClass, tableItem);
+        }
+        else {
+            throw new Error("Malformed data. Unable to infer entity type");
+        }
     }
 }
 exports.default = Query;

package/dist/src/operations/Query/types.d.ts

@@ -1,7 +1,6 @@
 import type DynaRecord from "../../DynaRecord";
 import type { KeyConditions, QueryOptions as QueryBuilderOptions, SortKeyCondition } from "../../query-utils";
-import type { BelongsToLink } from "../../relationships";
-import type { EntityAttributes } from "../types";
+import type { EntityAttributesInstance } from "../types";
 /**
  * Extends the basic query builder options by adding an optional sort key condition for more precise querying capabilities.
  *
@@ -24,13 +23,48 @@ export type EntityKeyConditions<T> = {
     [K in keyof T]?: KeyConditions;
 };
 /**
- * Represents the results of a query operation, which can include both entity attributes and associated `BelongsToLink` objects.
+ * Asserts that a given type `E` extends `DynaRecord`. If `E` does not extend `DynaRecord`, it resolves to `never`.
+ *
+ * This is used to enforce that only valid `DynaRecord` types are included in relationships or other dependent types.
+ *
+ * @template E - The type to assert.
+ */
+export type AssertDynaRecord<E> = E extends DynaRecord ? E : never;
+/**
+ * Extracts the keys of a `DynaRecord` type `T` whose properties are either a `DynaRecord` or an array of `DynaRecord`.
+ *
+ * This type is used to identify properties in a `DynaRecord` that represent relationships to other entities.
+ *
+ * @template T - The `DynaRecord` type to evaluate.
+ * @returns A union of property names in `T` that represent relationships.
+ */
+export type RelationshipProperties<T extends DynaRecord> = Extract<{
+    [K in keyof T]: NonNullable<T[K]> extends DynaRecord | DynaRecord[] ? K : never;
+}[keyof T], string>;
+/**
+ * Maps the relationship properties of a `DynaRecord` type `T` to their corresponding entity types.
+ *
+ * For array relationships, this resolves to the entity type of the array elements.
+ * For single relationships, this resolves to the entity type of the property.
+ *
+ * @template T - The `DynaRecord` type to evaluate.
+ * @returns A union of all entity types referenced by the relationships in `T`.
+ */
+export type RelationshipEntities<T extends DynaRecord> = {
+    [K in RelationshipProperties<T>]: NonNullable<T[K]> extends Array<infer U> ? AssertDynaRecord<U> : AssertDynaRecord<NonNullable<T[K]>>;
+}[RelationshipProperties<T>];
+/**
+ * Represents the results of a query operation for a `DynaRecord` entity `T`.
+ *
+ * The results include attributes of the queried entity as well as attributes of its related entities.
+ * For related entities, their attributes are derived from their relationship definitions in `T`.
  *
  * @template T - The type of the entity being queried, extending `DynaRecord`.
+ * @returns An array of objects representing the entity attributes of `T` or its related entities.
  */
-export type QueryResults<T extends DynaRecord> = Array<EntityAttributes<T> | BelongsToLink>;
+export type QueryResults<T extends DynaRecord> = Array<EntityAttributesInstance<T> | (RelationshipEntities<T> extends infer R ? R extends DynaRecord ? EntityAttributesInstance<R> : never : never)>;
 /**
- * A utility type that represents a single item in the query results, which can be either an entity or a `BelongsToLink`. This type is derived from the `QueryResults` array type, providing a convenient way to refer to individual results from a query.
+ * A utility type that represents a single item in the query results, which can be either an entity or a associated entity. This type is derived from the `QueryResults` array type, providing a convenient way to refer to individual results from a query.
  *
  * @template T - The type of the entity being queried, extending `DynaRecord`.
  */

package/dist/src/operations/Query/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/operations/Query/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EACV,aAAa,EACb,YAAY,IAAI,mBAAmB,EACnC,gBAAgB,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEjD;;;;;GAKG;AACH,MAAM,WAAW,YAAa,SAAQ,mBAAmB;IACvD;;OAEG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC;CAChC;AAED;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;KAClC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,aAAa;CAC/B,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,UAAU,IAAI,KAAK,CACpD,gBAAgB,CAAC,CAAC,CAAC,GAAG,aAAa,CACpC,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,UAAU,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/operations/Query/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EACV,aAAa,EACb,YAAY,IAAI,mBAAmB,EACnC,gBAAgB,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAEzD;;;;;GAKG;AACH,MAAM,WAAW,YAAa,SAAQ,mBAAmB;IACvD;;OAEG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC;CAChC;AAED;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI;KAClC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,aAAa;CAC/B,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,GAAG,CAAC,GAAG,KAAK,CAAC;AAEnE;;;;;;;GAOG;AACH,MAAM,MAAM,sBAAsB,CAAC,CAAC,SAAS,UAAU,IAAI,OAAO,CAChE;KACG,CAAC,IAAI,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,GAC/D,CAAC,GACD,KAAK;CACV,CAAC,MAAM,CAAC,CAAC,EACV,MAAM,CACP,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,UAAU,IAAI;KACtD,CAAC,IAAI,sBAAsB,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,GACtE,gBAAgB,CAAC,CAAC,CAAC,GACnB,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACxC,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;AAE7B;;;;;;;;GAQG;AACH,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,UAAU,IAAI,KAAK,CAClD,wBAAwB,CAAC,CAAC,CAAC,GAC3B,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,GACpC,CAAC,SAAS,UAAU,GAClB,wBAAwB,CAAC,CAAC,CAAC,GAC3B,KAAK,GACP,KAAK,CAAC,CACb,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,UAAU,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC"}