@twin.org/entity-storage-connector-dynamodb 0.0.1-next.2 → 0.0.1-next.21

package/README.md

@@ -13,7 +13,7 @@ npm install @twin.org/entity-storage-connector-dynamodb
 The tests developed are functional tests and need an instance of DynamoDB up and running. To run DynamoDB locally:
 
 ```sh
-docker run -p 8000:8000 --name dynamodb --hostname dynamodb -d amazon/dynamodb-local
+docker run -p 8000:8000 --name twin-entity-storage-dynamodb --hostname dynamodb -d amazon/dynamodb-local
 ```
 
 Afterwards you can run the tests as follows:

package/dist/cjs/index.cjs

@@ -50,9 +50,6 @@ class DynamoDbEntityStorageConnector {
     /**
      * Create a new instance of DynamoDbEntityStorageConnector.
      * @param options The options for the connector.
-     * @param options.entitySchema The schema for the entity.
-     * @param options.loggingConnectorType The type of logging connector to use, defaults to no logging.
-     * @param options.config The configuration for the connector.
      */
     constructor(options) {
         core.Guards.object(this.CLASS_NAME, "options", options);
@@ -214,17 +211,25 @@ class DynamoDbEntityStorageConnector {
         }
         return true;
     }
+    /**
+     * Get the schema for the entities.
+     * @returns The schema for the entities.
+     */
+    getSchema() {
+        return this._entitySchema;
+    }
     /**
      * Get an entity.
      * @param id The id of the entity to get, or the index value if secondaryIndex is set.
      * @param secondaryIndex Get the item using a secondary index.
+     * @param conditions The optional conditions to match for the entities.
      * @returns The object if it can be found or undefined.
      */
-    async get(id, secondaryIndex) {
+    async get(id, secondaryIndex, conditions) {
         core.Guards.stringValue(this.CLASS_NAME, "id", id);
         try {
             const docClient = this.createDocClient();
-            if (core.Is.undefined(secondaryIndex)) {
+            if (core.Is.empty(secondaryIndex) && core.Is.empty(conditions)) {
                 const getCommand = new libDynamodb.GetCommand({
                     TableName: this._config.tableName,
                     Key: {
@@ -236,27 +241,27 @@ class DynamoDbEntityStorageConnector {
                 delete response.Item?.[DynamoDbEntityStorageConnector._PARTITION_ID_NAME];
                 return response.Item;
             }
-            const secIndex = secondaryIndex.toString();
-            const globalSecondaryIndex = `${secIndex}Index`;
-            const queryCommand = new clientDynamodb.QueryCommand({
-                TableName: this._config.tableName,
-                IndexName: globalSecondaryIndex,
-                KeyConditionExpression: `#${secIndex} = :id AND #${DynamoDbEntityStorageConnector._PARTITION_ID_NAME} = :${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`,
-                ExpressionAttributeNames: {
-                    [`#${secIndex}`]: secIndex,
-                    [`#${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: DynamoDbEntityStorageConnector._PARTITION_ID_NAME
-                },
-                ExpressionAttributeValues: {
-                    [`:${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: {
-                        S: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE
-                    },
-                    ":id": { S: id }
+            const finalConditions = {
+                conditions: []
+            };
+            if (core.Is.stringValue(secondaryIndex)) {
+                finalConditions.conditions.push({
+                    property: secondaryIndex,
+                    comparison: entity.ComparisonOperator.Equals,
+                    value: id
+                });
+            }
+            if (core.Is.arrayValue(conditions)) {
+                for (const c of conditions) {
+                    finalConditions.conditions.push({
+                        property: c.property,
+                        comparison: entity.ComparisonOperator.Equals,
+                        value: c.value
+                    });
                 }
-            });
-            const response = await docClient.send(queryCommand);
-            if (response.Items?.length === 1) {
-                return utilDynamodb.unmarshall(response.Items[0]);
             }
+            const queryResult = await this.internalQuery(finalConditions, undefined, undefined, undefined, 1, secondaryIndex);
+            return queryResult.entities[0];
         }
         catch (err) {
             if (core.BaseError.isErrorCode(err, "ResourceNotFoundException")) {
@@ -268,28 +273,39 @@ class DynamoDbEntityStorageConnector {
                 id
             }, err);
         }
-        return undefined;
     }
     /**
      * Set an entity.
      * @param entity The entity to set.
+     * @param conditions The optional conditions to match for the entities.
      * @returns The id of the entity.
      */
-    async set(entity) {
+    async set(entity, conditions) {
         core.Guards.object(this.CLASS_NAME, "entity", entity);
         const id = entity[this._primaryKey.property];
         try {
             const docClient = this.createDocClient();
+            const { conditionExpression, attributeNames, attributeValues } = this.buildConditionExpression(conditions);
             const putCommand = new libDynamodb.PutCommand({
                 TableName: this._config.tableName,
                 Item: {
                     [DynamoDbEntityStorageConnector._PARTITION_ID_NAME]: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE,
                     ...entity
-                }
+                },
+                // Only set the condition expression if we have conditions to match
+                // and the primary key exists, otherwise we are creating a new object
+                ConditionExpression: core.Is.stringValue(conditionExpression)
+                    ? `(attribute_exists(${this._primaryKey.property}) AND ${conditionExpression}) OR attribute_not_exists(${this._primaryKey.property})`
+                    : undefined,
+                ExpressionAttributeNames: attributeNames,
+                ExpressionAttributeValues: attributeValues
             });
             await docClient.send(putCommand);
         }
         catch (err) {
+            if (core.BaseError.isErrorName(err, "ConditionalCheckFailedException")) {
+                return;
+            }
             if (core.BaseError.isErrorCode(err, "ResourceNotFoundException")) {
                 throw new core.GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
                     tableName: this._config.tableName
@@ -303,22 +319,30 @@ class DynamoDbEntityStorageConnector {
     /**
      * Remove the entity.
      * @param id The id of the entity to remove.
+     * @param conditions The optional conditions to match for the entities.
      * @returns Nothing.
      */
-    async remove(id) {
+    async remove(id, conditions) {
         core.Guards.stringValue(this.CLASS_NAME, "id", id);
         try {
             const docClient = this.createDocClient();
+            const { conditionExpression, attributeNames, attributeValues } = this.buildConditionExpression(conditions);
             const deleteCommand = new libDynamodb.DeleteCommand({
                 TableName: this._config.tableName,
                 Key: {
                     [DynamoDbEntityStorageConnector._PARTITION_ID_NAME]: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE,
                     [this._primaryKey.property]: id
-                }
+                },
+                ConditionExpression: conditionExpression,
+                ExpressionAttributeNames: attributeNames,
+                ExpressionAttributeValues: attributeValues
             });
             await docClient.send(deleteCommand);
         }
         catch (err) {
+            if (core.BaseError.isErrorName(err, "ConditionalCheckFailedException")) {
+                return;
+            }
             if (core.BaseError.isErrorCode(err, "ResourceNotFoundException")) {
                 throw new core.GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
                     table: this._config.tableName
@@ -340,80 +364,7 @@ class DynamoDbEntityStorageConnector {
      * and a cursor which can be used to request more entities.
      */
     async query(conditions, sortProperties, properties, cursor, pageSize) {
-        const sql = "";
-        try {
-            const returnSize = pageSize ?? DynamoDbEntityStorageConnector._PAGE_SIZE;
-            let indexName;
-            // If we have a sortable property defined in the descriptor then we must use
-            // the secondary index for the query
-            if (core.Is.arrayValue(sortProperties)) {
-                if (sortProperties.length > 1) {
-                    throw new core.GeneralError(this.CLASS_NAME, "sortSingle");
-                }
-                for (const sortProperty of sortProperties) {
-                    const propertySchema = this._entitySchema.properties?.find(e => e.property === sortProperty.property);
-                    if (core.Is.undefined(propertySchema) ||
-                        (!propertySchema.isPrimary &&
-                            !propertySchema.isSecondary &&
-                            core.Is.empty(propertySchema.sortDirection))) {
-                        throw new core.GeneralError(this.CLASS_NAME, "sortNotIndexed", {
-                            property: sortProperty.property
-                        });
-                    }
-                    indexName = propertySchema.isPrimary
-                        ? undefined
-                        : `${sortProperty.property}Index`;
-                }
-            }
-            const attributeNames = { "#partitionId": "partitionId" };
-            const attributeValues = {
-                [`:${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: {
-                    S: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE
-                }
-            };
-            const expressions = this.buildQueryParameters("", conditions, attributeNames, attributeValues);
-            let keyExpression = "#partitionId = :partitionId";
-            if (expressions.keyCondition.length > 0) {
-                keyExpression += ` AND ${expressions.keyCondition}`;
-            }
-            const query = new clientDynamodb.QueryCommand({
-                TableName: this._config.tableName,
-                IndexName: indexName,
-                KeyConditionExpression: keyExpression,
-                FilterExpression: core.Is.stringValue(expressions.filterCondition)
-                    ? expressions.filterCondition
-                    : undefined,
-                ExpressionAttributeNames: attributeNames,
-                ExpressionAttributeValues: attributeValues,
-                ProjectionExpression: properties?.map(p => p).join(", "),
-                Limit: returnSize,
-                ExclusiveStartKey: core.Is.empty(cursor)
-                    ? undefined
-                    : core.ObjectHelper.fromBytes(core.Converter.base64ToBytes(cursor))
-            });
-            const connection = this.createDocClient();
-            const results = await connection.send(query);
-            let entities = [];
-            if (core.Is.arrayValue(results.Items)) {
-                entities = results.Items.map(item => utilDynamodb.unmarshall(item));
-            }
-            return {
-                entities,
-                cursor: core.Is.empty(results.LastEvaluatedKey)
-                    ? undefined
-                    : core.Converter.bytesToBase64(core.ObjectHelper.toBytes(results.LastEvaluatedKey))
-            };
-        }
-        catch (err) {
-            if (core.BaseError.isErrorCode(err, "ResourceNotFoundException")) {
-                throw new core.GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
-                    table: this._config.tableName
-                }, err);
-            }
-            throw new core.GeneralError(this.CLASS_NAME, "queryFailed", {
-                sql
-            }, err);
-        }
+        return this.internalQuery(conditions, sortProperties, properties, cursor, pageSize);
     }
     /**
      * Delete the table.
@@ -427,7 +378,7 @@ class DynamoDbEntityStorageConnector {
         catch { }
     }
     /**
-     * Create an SQL condition clause.
+     * Create the parameters for a query.
      * @param objectPath The path for the nested object.
      * @param condition The conditions to create the query from.
      * @param attributeNames The attribute names to use in the query.
@@ -435,7 +386,7 @@ class DynamoDbEntityStorageConnector {
      * @returns The condition clause.
      * @internal
      */
-    buildQueryParameters(objectPath, condition, attributeNames, attributeValues) {
+    buildQueryParameters(objectPath, condition, attributeNames, attributeValues, secondaryIndex) {
         // If no conditions are defined then return empty string
         if (core.Is.undefined(condition)) {
             return {
@@ -444,11 +395,21 @@ class DynamoDbEntityStorageConnector {
             };
         }
         if ("conditions" in condition) {
+            if (condition.conditions.length === 0) {
+                return {
+                    keyCondition: "",
+                    filterCondition: ""
+                };
+            }
             // It's a group of comparisons, so check the individual items and combine with the logical operator
-            const joinConditions = condition.conditions.map(c => this.buildQueryParameters(objectPath, c, attributeNames, attributeValues));
+            const joinConditions = condition.conditions.map(c => this.buildQueryParameters(objectPath, c, attributeNames, attributeValues, secondaryIndex));
             const logicalOperator = this.mapConditionalOperator(condition.logicalOperator);
-            const keyCondition = joinConditions.map(j => j.keyCondition).join(` ${logicalOperator} `);
+            const keyCondition = joinConditions
+                .filter(j => j.keyCondition.length > 0)
+                .map(j => j.keyCondition)
+                .join(` ${logicalOperator} `);
             const filterCondition = joinConditions
+                .filter(j => j.filterCondition.length > 0)
                 .map(j => j.filterCondition)
                 .join(` ${logicalOperator} `);
             return {
@@ -459,9 +420,10 @@ class DynamoDbEntityStorageConnector {
         const schemaProp = this._entitySchema.properties?.find(p => p.property === condition.property);
         // It's a single value so just create the property comparison for the condition
         const comparison = this.mapComparisonOperator(objectPath, condition, schemaProp?.type, attributeNames, attributeValues);
+        const isKey = schemaProp?.isPrimary || (schemaProp?.isSecondary && schemaProp?.property === secondaryIndex);
         return {
-            keyCondition: schemaProp?.isPrimary ? comparison : "",
-            filterCondition: schemaProp?.isPrimary ? "" : comparison
+            keyCondition: isKey ? comparison : "",
+            filterCondition: !isKey ? comparison : ""
         };
     }
     /**
@@ -642,6 +604,128 @@ class DynamoDbEntityStorageConnector {
             return false;
         }
     }
+    /**
+     * Find all the entities which match the conditions.
+     * @param conditions The conditions to match for the entities.
+     * @param sortProperties The optional sort order.
+     * @param properties The optional properties to return, defaults to all.
+     * @param cursor The cursor to request the next page of entities.
+     * @param pageSize The suggested number of entities to return in each chunk, in some scenarios can return a different amount.
+     * @param secondaryIndex The secondary index to use for the query.
+     * @returns All the entities for the storage matching the conditions,
+     * and a cursor which can be used to request more entities.
+     * @internal
+     */
+    async internalQuery(conditions, sortProperties, properties, cursor, pageSize, secondaryIndex) {
+        try {
+            const returnSize = pageSize ?? DynamoDbEntityStorageConnector._PAGE_SIZE;
+            let indexName = core.Is.stringValue(secondaryIndex)
+                ? `${secondaryIndex}Index`
+                : undefined;
+            // If we have a sortable property defined in the descriptor then we must use
+            // the secondary index for the query
+            let scanAscending = true;
+            if (core.Is.arrayValue(sortProperties)) {
+                if (sortProperties.length > 1) {
+                    throw new core.GeneralError(this.CLASS_NAME, "sortSingle");
+                }
+                for (const sortProperty of sortProperties) {
+                    const propertySchema = this._entitySchema.properties?.find(e => e.property === sortProperty.property);
+                    if (core.Is.undefined(propertySchema) ||
+                        (!propertySchema.isPrimary &&
+                            !propertySchema.isSecondary &&
+                            core.Is.empty(propertySchema.sortDirection))) {
+                        throw new core.GeneralError(this.CLASS_NAME, "sortNotIndexed", {
+                            property: sortProperty.property
+                        });
+                    }
+                    indexName = propertySchema.isPrimary
+                        ? undefined
+                        : `${sortProperty.property}Index`;
+                    scanAscending = sortProperty.sortDirection === entity.SortDirection.Ascending;
+                }
+            }
+            const attributeNames = { "#partitionId": "partitionId" };
+            const attributeValues = {
+                [`:${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: {
+                    S: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE
+                }
+            };
+            const expressions = this.buildQueryParameters("", conditions, attributeNames, attributeValues, secondaryIndex);
+            let keyExpression = "#partitionId = :partitionId";
+            if (expressions.keyCondition.length > 0) {
+                keyExpression += ` AND ${expressions.keyCondition}`;
+            }
+            const query = new clientDynamodb.QueryCommand({
+                TableName: this._config.tableName,
+                IndexName: indexName,
+                KeyConditionExpression: keyExpression,
+                FilterExpression: core.Is.stringValue(expressions.filterCondition)
+                    ? expressions.filterCondition
+                    : undefined,
+                ExpressionAttributeNames: attributeNames,
+                ExpressionAttributeValues: attributeValues,
+                ProjectionExpression: properties?.map(p => p).join(", "),
+                Limit: returnSize,
+                ScanIndexForward: scanAscending,
+                ExclusiveStartKey: core.Is.empty(cursor)
+                    ? undefined
+                    : core.ObjectHelper.fromBytes(core.Converter.base64ToBytes(cursor))
+            });
+            const connection = this.createDocClient();
+            const results = await connection.send(query);
+            let entities = [];
+            if (core.Is.arrayValue(results.Items)) {
+                entities = results.Items.map(item => utilDynamodb.unmarshall(item));
+            }
+            return {
+                entities,
+                cursor: core.Is.empty(results.LastEvaluatedKey)
+                    ? undefined
+                    : core.Converter.bytesToBase64(core.ObjectHelper.toBytes(results.LastEvaluatedKey))
+            };
+        }
+        catch (err) {
+            if (core.BaseError.isErrorCode(err, "ResourceNotFoundException")) {
+                throw new core.GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
+                    table: this._config.tableName
+                }, err);
+            }
+            throw new core.GeneralError(this.CLASS_NAME, "queryFailed", undefined, err);
+        }
+    }
+    /**
+     * Build the condition expression for the query.
+     * @param conditions The conditions to build the expression from.
+     * @returns The condition expression.
+     * @throws GeneralError if the property is not found in the schema.
+     * @internal
+     */
+    buildConditionExpression(conditions) {
+        let conditionExpression;
+        let attributeNames;
+        let attributeValues;
+        if (core.Is.arrayValue(conditions)) {
+            const expressions = [];
+            for (const c of conditions) {
+                const schemaProp = this._entitySchema.properties?.find(p => p.property === c.property);
+                if (core.Is.undefined(schemaProp)) {
+                    throw new core.GeneralError(this.CLASS_NAME, "propertyNotFound", {
+                        property: c.property
+                    });
+                }
+                const attributeName = `#${c.property}`;
+                const attributeValueName = `:${c.property}`;
+                attributeNames ??= {};
+                attributeValues ??= {};
+                attributeNames[attributeName] = c.property;
+                attributeValues[attributeValueName] = c.value;
+                expressions.push(`${attributeName} = ${attributeValueName}`);
+            }
+            conditionExpression = expressions.join(" AND ");
+        }
+        return { conditionExpression, attributeNames, attributeValues };
+    }
 }
 
 exports.DynamoDbEntityStorageConnector = DynamoDbEntityStorageConnector;

package/dist/esm/index.mjs

@@ -1,8 +1,8 @@
-import { waitUntilTableExists, QueryCommand, DynamoDB } from '@aws-sdk/client-dynamodb';
+import { waitUntilTableExists, DynamoDB, QueryCommand } from '@aws-sdk/client-dynamodb';
 import { GetCommand, PutCommand, DeleteCommand, DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
 import { unmarshall } from '@aws-sdk/util-dynamodb';
-import { Guards, Is, BaseError, GeneralError, ObjectHelper, Converter, Coerce } from '@twin.org/core';
-import { EntitySchemaFactory, EntitySchemaHelper, ComparisonOperator, LogicalOperator } from '@twin.org/entity';
+import { Guards, Is, BaseError, GeneralError, Coerce, ObjectHelper, Converter } from '@twin.org/core';
+import { EntitySchemaFactory, EntitySchemaHelper, ComparisonOperator, LogicalOperator, SortDirection } from '@twin.org/entity';
 import { LoggingConnectorFactory } from '@twin.org/logging-models';
 
 // Copyright 2024 IOTA Stiftung.
@@ -48,9 +48,6 @@ class DynamoDbEntityStorageConnector {
     /**
      * Create a new instance of DynamoDbEntityStorageConnector.
      * @param options The options for the connector.
-     * @param options.entitySchema The schema for the entity.
-     * @param options.loggingConnectorType The type of logging connector to use, defaults to no logging.
-     * @param options.config The configuration for the connector.
      */
     constructor(options) {
         Guards.object(this.CLASS_NAME, "options", options);
@@ -212,17 +209,25 @@ class DynamoDbEntityStorageConnector {
         }
         return true;
     }
+    /**
+     * Get the schema for the entities.
+     * @returns The schema for the entities.
+     */
+    getSchema() {
+        return this._entitySchema;
+    }
     /**
      * Get an entity.
      * @param id The id of the entity to get, or the index value if secondaryIndex is set.
      * @param secondaryIndex Get the item using a secondary index.
+     * @param conditions The optional conditions to match for the entities.
      * @returns The object if it can be found or undefined.
      */
-    async get(id, secondaryIndex) {
+    async get(id, secondaryIndex, conditions) {
         Guards.stringValue(this.CLASS_NAME, "id", id);
         try {
             const docClient = this.createDocClient();
-            if (Is.undefined(secondaryIndex)) {
+            if (Is.empty(secondaryIndex) && Is.empty(conditions)) {
                 const getCommand = new GetCommand({
                     TableName: this._config.tableName,
                     Key: {
@@ -234,27 +239,27 @@ class DynamoDbEntityStorageConnector {
                 delete response.Item?.[DynamoDbEntityStorageConnector._PARTITION_ID_NAME];
                 return response.Item;
             }
-            const secIndex = secondaryIndex.toString();
-            const globalSecondaryIndex = `${secIndex}Index`;
-            const queryCommand = new QueryCommand({
-                TableName: this._config.tableName,
-                IndexName: globalSecondaryIndex,
-                KeyConditionExpression: `#${secIndex} = :id AND #${DynamoDbEntityStorageConnector._PARTITION_ID_NAME} = :${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`,
-                ExpressionAttributeNames: {
-                    [`#${secIndex}`]: secIndex,
-                    [`#${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: DynamoDbEntityStorageConnector._PARTITION_ID_NAME
-                },
-                ExpressionAttributeValues: {
-                    [`:${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: {
-                        S: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE
-                    },
-                    ":id": { S: id }
+            const finalConditions = {
+                conditions: []
+            };
+            if (Is.stringValue(secondaryIndex)) {
+                finalConditions.conditions.push({
+                    property: secondaryIndex,
+                    comparison: ComparisonOperator.Equals,
+                    value: id
+                });
+            }
+            if (Is.arrayValue(conditions)) {
+                for (const c of conditions) {
+                    finalConditions.conditions.push({
+                        property: c.property,
+                        comparison: ComparisonOperator.Equals,
+                        value: c.value
+                    });
                 }
-            });
-            const response = await docClient.send(queryCommand);
-            if (response.Items?.length === 1) {
-                return unmarshall(response.Items[0]);
             }
+            const queryResult = await this.internalQuery(finalConditions, undefined, undefined, undefined, 1, secondaryIndex);
+            return queryResult.entities[0];
         }
         catch (err) {
             if (BaseError.isErrorCode(err, "ResourceNotFoundException")) {
@@ -266,28 +271,39 @@ class DynamoDbEntityStorageConnector {
                 id
             }, err);
         }
-        return undefined;
     }
     /**
      * Set an entity.
      * @param entity The entity to set.
+     * @param conditions The optional conditions to match for the entities.
      * @returns The id of the entity.
      */
-    async set(entity) {
+    async set(entity, conditions) {
         Guards.object(this.CLASS_NAME, "entity", entity);
         const id = entity[this._primaryKey.property];
         try {
             const docClient = this.createDocClient();
+            const { conditionExpression, attributeNames, attributeValues } = this.buildConditionExpression(conditions);
             const putCommand = new PutCommand({
                 TableName: this._config.tableName,
                 Item: {
                     [DynamoDbEntityStorageConnector._PARTITION_ID_NAME]: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE,
                     ...entity
-                }
+                },
+                // Only set the condition expression if we have conditions to match
+                // and the primary key exists, otherwise we are creating a new object
+                ConditionExpression: Is.stringValue(conditionExpression)
+                    ? `(attribute_exists(${this._primaryKey.property}) AND ${conditionExpression}) OR attribute_not_exists(${this._primaryKey.property})`
+                    : undefined,
+                ExpressionAttributeNames: attributeNames,
+                ExpressionAttributeValues: attributeValues
             });
             await docClient.send(putCommand);
         }
         catch (err) {
+            if (BaseError.isErrorName(err, "ConditionalCheckFailedException")) {
+                return;
+            }
             if (BaseError.isErrorCode(err, "ResourceNotFoundException")) {
                 throw new GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
                     tableName: this._config.tableName
@@ -301,22 +317,30 @@ class DynamoDbEntityStorageConnector {
     /**
      * Remove the entity.
      * @param id The id of the entity to remove.
+     * @param conditions The optional conditions to match for the entities.
      * @returns Nothing.
      */
-    async remove(id) {
+    async remove(id, conditions) {
         Guards.stringValue(this.CLASS_NAME, "id", id);
         try {
             const docClient = this.createDocClient();
+            const { conditionExpression, attributeNames, attributeValues } = this.buildConditionExpression(conditions);
             const deleteCommand = new DeleteCommand({
                 TableName: this._config.tableName,
                 Key: {
                     [DynamoDbEntityStorageConnector._PARTITION_ID_NAME]: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE,
                     [this._primaryKey.property]: id
-                }
+                },
+                ConditionExpression: conditionExpression,
+                ExpressionAttributeNames: attributeNames,
+                ExpressionAttributeValues: attributeValues
             });
             await docClient.send(deleteCommand);
         }
         catch (err) {
+            if (BaseError.isErrorName(err, "ConditionalCheckFailedException")) {
+                return;
+            }
             if (BaseError.isErrorCode(err, "ResourceNotFoundException")) {
                 throw new GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
                     table: this._config.tableName
@@ -338,80 +362,7 @@ class DynamoDbEntityStorageConnector {
      * and a cursor which can be used to request more entities.
      */
     async query(conditions, sortProperties, properties, cursor, pageSize) {
-        const sql = "";
-        try {
-            const returnSize = pageSize ?? DynamoDbEntityStorageConnector._PAGE_SIZE;
-            let indexName;
-            // If we have a sortable property defined in the descriptor then we must use
-            // the secondary index for the query
-            if (Is.arrayValue(sortProperties)) {
-                if (sortProperties.length > 1) {
-                    throw new GeneralError(this.CLASS_NAME, "sortSingle");
-                }
-                for (const sortProperty of sortProperties) {
-                    const propertySchema = this._entitySchema.properties?.find(e => e.property === sortProperty.property);
-                    if (Is.undefined(propertySchema) ||
-                        (!propertySchema.isPrimary &&
-                            !propertySchema.isSecondary &&
-                            Is.empty(propertySchema.sortDirection))) {
-                        throw new GeneralError(this.CLASS_NAME, "sortNotIndexed", {
-                            property: sortProperty.property
-                        });
-                    }
-                    indexName = propertySchema.isPrimary
-                        ? undefined
-                        : `${sortProperty.property}Index`;
-                }
-            }
-            const attributeNames = { "#partitionId": "partitionId" };
-            const attributeValues = {
-                [`:${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: {
-                    S: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE
-                }
-            };
-            const expressions = this.buildQueryParameters("", conditions, attributeNames, attributeValues);
-            let keyExpression = "#partitionId = :partitionId";
-            if (expressions.keyCondition.length > 0) {
-                keyExpression += ` AND ${expressions.keyCondition}`;
-            }
-            const query = new QueryCommand({
-                TableName: this._config.tableName,
-                IndexName: indexName,
-                KeyConditionExpression: keyExpression,
-                FilterExpression: Is.stringValue(expressions.filterCondition)
-                    ? expressions.filterCondition
-                    : undefined,
-                ExpressionAttributeNames: attributeNames,
-                ExpressionAttributeValues: attributeValues,
-                ProjectionExpression: properties?.map(p => p).join(", "),
-                Limit: returnSize,
-                ExclusiveStartKey: Is.empty(cursor)
-                    ? undefined
-                    : ObjectHelper.fromBytes(Converter.base64ToBytes(cursor))
-            });
-            const connection = this.createDocClient();
-            const results = await connection.send(query);
-            let entities = [];
-            if (Is.arrayValue(results.Items)) {
-                entities = results.Items.map(item => unmarshall(item));
-            }
-            return {
-                entities,
-                cursor: Is.empty(results.LastEvaluatedKey)
-                    ? undefined
-                    : Converter.bytesToBase64(ObjectHelper.toBytes(results.LastEvaluatedKey))
-            };
-        }
-        catch (err) {
-            if (BaseError.isErrorCode(err, "ResourceNotFoundException")) {
-                throw new GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
-                    table: this._config.tableName
-                }, err);
-            }
-            throw new GeneralError(this.CLASS_NAME, "queryFailed", {
-                sql
-            }, err);
-        }
+        return this.internalQuery(conditions, sortProperties, properties, cursor, pageSize);
     }
     /**
      * Delete the table.
@@ -425,7 +376,7 @@ class DynamoDbEntityStorageConnector {
         catch { }
     }
     /**
-     * Create an SQL condition clause.
+     * Create the parameters for a query.
      * @param objectPath The path for the nested object.
      * @param condition The conditions to create the query from.
      * @param attributeNames The attribute names to use in the query.
@@ -433,7 +384,7 @@ class DynamoDbEntityStorageConnector {
      * @returns The condition clause.
      * @internal
      */
-    buildQueryParameters(objectPath, condition, attributeNames, attributeValues) {
+    buildQueryParameters(objectPath, condition, attributeNames, attributeValues, secondaryIndex) {
         // If no conditions are defined then return empty string
         if (Is.undefined(condition)) {
             return {
@@ -442,11 +393,21 @@ class DynamoDbEntityStorageConnector {
             };
         }
         if ("conditions" in condition) {
+            if (condition.conditions.length === 0) {
+                return {
+                    keyCondition: "",
+                    filterCondition: ""
+                };
+            }
             // It's a group of comparisons, so check the individual items and combine with the logical operator
-            const joinConditions = condition.conditions.map(c => this.buildQueryParameters(objectPath, c, attributeNames, attributeValues));
+            const joinConditions = condition.conditions.map(c => this.buildQueryParameters(objectPath, c, attributeNames, attributeValues, secondaryIndex));
             const logicalOperator = this.mapConditionalOperator(condition.logicalOperator);
-            const keyCondition = joinConditions.map(j => j.keyCondition).join(` ${logicalOperator} `);
+            const keyCondition = joinConditions
+                .filter(j => j.keyCondition.length > 0)
+                .map(j => j.keyCondition)
+                .join(` ${logicalOperator} `);
             const filterCondition = joinConditions
+                .filter(j => j.filterCondition.length > 0)
                 .map(j => j.filterCondition)
                 .join(` ${logicalOperator} `);
             return {
@@ -457,9 +418,10 @@ class DynamoDbEntityStorageConnector {
         const schemaProp = this._entitySchema.properties?.find(p => p.property === condition.property);
         // It's a single value so just create the property comparison for the condition
         const comparison = this.mapComparisonOperator(objectPath, condition, schemaProp?.type, attributeNames, attributeValues);
+        const isKey = schemaProp?.isPrimary || (schemaProp?.isSecondary && schemaProp?.property === secondaryIndex);
         return {
-            keyCondition: schemaProp?.isPrimary ? comparison : "",
-            filterCondition: schemaProp?.isPrimary ? "" : comparison
+            keyCondition: isKey ? comparison : "",
+            filterCondition: !isKey ? comparison : ""
         };
     }
     /**
@@ -640,6 +602,128 @@ class DynamoDbEntityStorageConnector {
             return false;
         }
     }
+    /**
+     * Find all the entities which match the conditions.
+     * @param conditions The conditions to match for the entities.
+     * @param sortProperties The optional sort order.
+     * @param properties The optional properties to return, defaults to all.
+     * @param cursor The cursor to request the next page of entities.
+     * @param pageSize The suggested number of entities to return in each chunk, in some scenarios can return a different amount.
+     * @param secondaryIndex The secondary index to use for the query.
+     * @returns All the entities for the storage matching the conditions,
+     * and a cursor which can be used to request more entities.
+     * @internal
+     */
+    async internalQuery(conditions, sortProperties, properties, cursor, pageSize, secondaryIndex) {
+        try {
+            const returnSize = pageSize ?? DynamoDbEntityStorageConnector._PAGE_SIZE;
+            let indexName = Is.stringValue(secondaryIndex)
+                ? `${secondaryIndex}Index`
+                : undefined;
+            // If we have a sortable property defined in the descriptor then we must use
+            // the secondary index for the query
+            let scanAscending = true;
+            if (Is.arrayValue(sortProperties)) {
+                if (sortProperties.length > 1) {
+                    throw new GeneralError(this.CLASS_NAME, "sortSingle");
+                }
+                for (const sortProperty of sortProperties) {
+                    const propertySchema = this._entitySchema.properties?.find(e => e.property === sortProperty.property);
+                    if (Is.undefined(propertySchema) ||
+                        (!propertySchema.isPrimary &&
+                            !propertySchema.isSecondary &&
+                            Is.empty(propertySchema.sortDirection))) {
+                        throw new GeneralError(this.CLASS_NAME, "sortNotIndexed", {
+                            property: sortProperty.property
+                        });
+                    }
+                    indexName = propertySchema.isPrimary
+                        ? undefined
+                        : `${sortProperty.property}Index`;
+                    scanAscending = sortProperty.sortDirection === SortDirection.Ascending;
+                }
+            }
+            const attributeNames = { "#partitionId": "partitionId" };
+            const attributeValues = {
+                [`:${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: {
+                    S: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE
+                }
+            };
+            const expressions = this.buildQueryParameters("", conditions, attributeNames, attributeValues, secondaryIndex);
+            let keyExpression = "#partitionId = :partitionId";
+            if (expressions.keyCondition.length > 0) {
+                keyExpression += ` AND ${expressions.keyCondition}`;
+            }
+            const query = new QueryCommand({
+                TableName: this._config.tableName,
+                IndexName: indexName,
+                KeyConditionExpression: keyExpression,
+                FilterExpression: Is.stringValue(expressions.filterCondition)
+                    ? expressions.filterCondition
+                    : undefined,
+                ExpressionAttributeNames: attributeNames,
+                ExpressionAttributeValues: attributeValues,
+                ProjectionExpression: properties?.map(p => p).join(", "),
+                Limit: returnSize,
+                ScanIndexForward: scanAscending,
+                ExclusiveStartKey: Is.empty(cursor)
+                    ? undefined
+                    : ObjectHelper.fromBytes(Converter.base64ToBytes(cursor))
+            });
+            const connection = this.createDocClient();
+            const results = await connection.send(query);
+            let entities = [];
+            if (Is.arrayValue(results.Items)) {
+                entities = results.Items.map(item => unmarshall(item));
+            }
+            return {
+                entities,
+                cursor: Is.empty(results.LastEvaluatedKey)
+                    ? undefined
+                    : Converter.bytesToBase64(ObjectHelper.toBytes(results.LastEvaluatedKey))
+            };
+        }
+        catch (err) {
+            if (BaseError.isErrorCode(err, "ResourceNotFoundException")) {
+                throw new GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
+                    table: this._config.tableName
+                }, err);
+            }
+            throw new GeneralError(this.CLASS_NAME, "queryFailed", undefined, err);
+        }
+    }
+    /**
+     * Build the condition expression for the query.
+     * @param conditions The conditions to build the expression from.
+     * @returns The condition expression.
+     * @throws GeneralError if the property is not found in the schema.
+     * @internal
+     */
+    buildConditionExpression(conditions) {
+        let conditionExpression;
+        let attributeNames;
+        let attributeValues;
+        if (Is.arrayValue(conditions)) {
+            const expressions = [];
+            for (const c of conditions) {
+                const schemaProp = this._entitySchema.properties?.find(p => p.property === c.property);
+                if (Is.undefined(schemaProp)) {
+                    throw new GeneralError(this.CLASS_NAME, "propertyNotFound", {
+                        property: c.property
+                    });
+                }
+                const attributeName = `#${c.property}`;
+                const attributeValueName = `:${c.property}`;
+                attributeNames ??= {};
+                attributeValues ??= {};
+                attributeNames[attributeName] = c.property;
+                attributeValues[attributeValueName] = c.value;
+                expressions.push(`${attributeName} = ${attributeValueName}`);
+            }
+            conditionExpression = expressions.join(" AND ");
+        }
+        return { conditionExpression, attributeNames, attributeValues };
+    }
 }
 
 export { DynamoDbEntityStorageConnector };

package/dist/types/dynamoDbEntityStorageConnector.d.ts

@@ -1,6 +1,6 @@
-import { type EntityCondition, type SortDirection } from "@twin.org/entity";
+import { type EntityCondition, type IEntitySchema, SortDirection } from "@twin.org/entity";
 import type { IEntityStorageConnector } from "@twin.org/entity-storage-models";
-import type { IDynamoDbEntityStorageConnectorConfig } from "./models/IDynamoDbEntityStorageConnectorConfig";
+import type { IDynamoDbEntityStorageConnectorConstructorOptions } from "./models/IDynamoDbEntityStorageConnectorConstructorOptions";
 /**
  * Class for performing entity storage operations using Dynamo DB.
  */
@@ -12,40 +12,50 @@ export declare class DynamoDbEntityStorageConnector<T = unknown> implements IEnt
     /**
      * Create a new instance of DynamoDbEntityStorageConnector.
      * @param options The options for the connector.
-     * @param options.entitySchema The schema for the entity.
-     * @param options.loggingConnectorType The type of logging connector to use, defaults to no logging.
-     * @param options.config The configuration for the connector.
      */
-    constructor(options: {
-        entitySchema: string;
-        loggingConnectorType?: string;
-        config: IDynamoDbEntityStorageConnectorConfig;
-    });
+    constructor(options: IDynamoDbEntityStorageConnectorConstructorOptions);
     /**
      * Bootstrap the component by creating and initializing any resources it needs.
      * @param nodeLoggingConnectorType The node logging connector type, defaults to "node-logging".
      * @returns True if the bootstrapping process was successful.
      */
     bootstrap(nodeLoggingConnectorType?: string): Promise<boolean>;
+    /**
+     * Get the schema for the entities.
+     * @returns The schema for the entities.
+     */
+    getSchema(): IEntitySchema;
     /**
      * Get an entity.
      * @param id The id of the entity to get, or the index value if secondaryIndex is set.
      * @param secondaryIndex Get the item using a secondary index.
+     * @param conditions The optional conditions to match for the entities.
      * @returns The object if it can be found or undefined.
      */
-    get(id: string, secondaryIndex?: keyof T): Promise<T | undefined>;
+    get(id: string, secondaryIndex?: keyof T, conditions?: {
+        property: keyof T;
+        value: unknown;
+    }[]): Promise<T | undefined>;
     /**
      * Set an entity.
      * @param entity The entity to set.
+     * @param conditions The optional conditions to match for the entities.
      * @returns The id of the entity.
      */
-    set(entity: T): Promise<void>;
+    set(entity: T, conditions?: {
+        property: keyof T;
+        value: unknown;
+    }[]): Promise<void>;
     /**
      * Remove the entity.
      * @param id The id of the entity to remove.
+     * @param conditions The optional conditions to match for the entities.
      * @returns Nothing.
      */
-    remove(id: string): Promise<void>;
+    remove(id: string, conditions?: {
+        property: keyof T;
+        value: unknown;
+    }[]): Promise<void>;
     /**
      * Find all the entities which match the conditions.
      * @param conditions The conditions to match for the entities.

package/dist/types/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./dynamoDbEntityStorageConnector";
 export * from "./models/IDynamoDbEntityStorageConnectorConfig";
+export * from "./models/IDynamoDbEntityStorageConnectorConstructorOptions";

package/dist/types/models/IDynamoDbEntityStorageConnectorConstructorOptions.d.ts

@@ -0,0 +1,18 @@
+import type { IDynamoDbEntityStorageConnectorConfig } from "./IDynamoDbEntityStorageConnectorConfig";
+/**
+ * Options for the Dynamo DB Entity Storage Connector constructor.
+ */
+export interface IDynamoDbEntityStorageConnectorConstructorOptions {
+    /**
+     * The schema for the entity
+     */
+    entitySchema: string;
+    /**
+     * The type of logging connector to use, defaults to no logging.
+     */
+    loggingConnectorType?: string;
+    /**
+     * The configuration for the connector.
+     */
+    config: IDynamoDbEntityStorageConnectorConfig;
+}

package/docs/changelog.md

@@ -1,5 +1,5 @@
 # @twin.org/entity-storage-connector-dynamodb - Changelog
 
-## v0.0.1-next.2
+## v0.0.1-next.21
 
 - Initial Release

package/docs/reference/classes/DynamoDbEntityStorageConnector.md

@@ -20,21 +20,11 @@ Create a new instance of DynamoDbEntityStorageConnector.
 
 #### Parameters
 
-• **options**
+##### options
 
-The options for the connector.
-
-• **options.entitySchema**: `string`
-
-The schema for the entity.
-
-• **options.loggingConnectorType?**: `string`
-
-The type of logging connector to use, defaults to no logging.
-
-• **options.config**: [`IDynamoDbEntityStorageConnectorConfig`](../interfaces/IDynamoDbEntityStorageConnectorConfig.md)
+[`IDynamoDbEntityStorageConnectorConstructorOptions`](../interfaces/IDynamoDbEntityStorageConnectorConstructorOptions.md)
 
-The configuration for the connector.
+The options for the connector.
 
 #### Returns
 
@@ -62,7 +52,9 @@ Bootstrap the component by creating and initializing any resources it needs.
 
 #### Parameters
 
-• **nodeLoggingConnectorType?**: `string`
+##### nodeLoggingConnectorType?
+
+`string`
 
 The node logging connector type, defaults to "node-logging".
 
@@ -78,22 +70,50 @@ True if the bootstrapping process was successful.
 
 ***
 
+### getSchema()
+
+> **getSchema**(): `IEntitySchema`
+
+Get the schema for the entities.
+
+#### Returns
+
+`IEntitySchema`
+
+The schema for the entities.
+
+#### Implementation of
+
+`IEntityStorageConnector.getSchema`
+
+***
+
 ### get()
 
-> **get**(`id`, `secondaryIndex`?): `Promise`\<`undefined` \| `T`\>
+> **get**(`id`, `secondaryIndex`?, `conditions`?): `Promise`\<`undefined` \| `T`\>
 
 Get an entity.
 
 #### Parameters
 
-• **id**: `string`
+##### id
+
+`string`
 
 The id of the entity to get, or the index value if secondaryIndex is set.
 
-• **secondaryIndex?**: keyof `T`
+##### secondaryIndex?
+
+keyof `T`
 
 Get the item using a secondary index.
 
+##### conditions?
+
+`object`[]
+
+The optional conditions to match for the entities.
+
 #### Returns
 
 `Promise`\<`undefined` \| `T`\>
@@ -108,16 +128,24 @@ The object if it can be found or undefined.
 
 ### set()
 
-> **set**(`entity`): `Promise`\<`void`\>
+> **set**(`entity`, `conditions`?): `Promise`\<`void`\>
 
 Set an entity.
 
 #### Parameters
 
-• **entity**: `T`
+##### entity
+
+`T`
 
 The entity to set.
 
+##### conditions?
+
+`object`[]
+
+The optional conditions to match for the entities.
+
 #### Returns
 
 `Promise`\<`void`\>
@@ -132,16 +160,24 @@ The id of the entity.
 
 ### remove()
 
-> **remove**(`id`): `Promise`\<`void`\>
+> **remove**(`id`, `conditions`?): `Promise`\<`void`\>
 
 Remove the entity.
 
 #### Parameters
 
-• **id**: `string`
+##### id
+
+`string`
 
 The id of the entity to remove.
 
+##### conditions?
+
+`object`[]
+
+The optional conditions to match for the entities.
+
 #### Returns
 
 `Promise`\<`void`\>
@@ -156,51 +192,49 @@ Nothing.
 
 ### query()
 
-> **query**(`conditions`?, `sortProperties`?, `properties`?, `cursor`?, `pageSize`?): `Promise`\<`object`\>
+> **query**(`conditions`?, `sortProperties`?, `properties`?, `cursor`?, `pageSize`?): `Promise`\<\{ `entities`: `Partial`\<`T`\>[]; `cursor`: `string`; \}\>
 
 Find all the entities which match the conditions.
 
 #### Parameters
 
-• **conditions?**: `EntityCondition`\<`T`\>
+##### conditions?
+
+`EntityCondition`\<`T`\>
 
 The conditions to match for the entities.
 
-• **sortProperties?**: `object`[]
+##### sortProperties?
+
+`object`[]
 
 The optional sort order.
 
-• **properties?**: keyof `T`[]
+##### properties?
+
+keyof `T`[]
 
 The optional properties to return, defaults to all.
 
-• **cursor?**: `string`
+##### cursor?
+
+`string`
 
 The cursor to request the next page of entities.
 
-• **pageSize?**: `number`
+##### pageSize?
+
+`number`
 
 The suggested number of entities to return in each chunk, in some scenarios can return a different amount.
 
 #### Returns
 
-`Promise`\<`object`\>
+`Promise`\<\{ `entities`: `Partial`\<`T`\>[]; `cursor`: `string`; \}\>
 
 All the entities for the storage matching the conditions,
 and a cursor which can be used to request more entities.
 
-##### entities
-
-> **entities**: `Partial`\<`T`\>[]
-
-The entities, which can be partial if a limited keys list was provided.
-
-##### cursor?
-
-> `optional` **cursor**: `string`
-
-An optional cursor, when defined can be used to call find to get more entities.
-
 #### Implementation of
 
 `IEntityStorageConnector.query`

package/docs/reference/index.md

@@ -7,3 +7,4 @@
 ## Interfaces
 
 - [IDynamoDbEntityStorageConnectorConfig](interfaces/IDynamoDbEntityStorageConnectorConfig.md)
+- [IDynamoDbEntityStorageConnectorConstructorOptions](interfaces/IDynamoDbEntityStorageConnectorConstructorOptions.md)

package/docs/reference/interfaces/IDynamoDbEntityStorageConnectorConstructorOptions.md

@@ -0,0 +1,27 @@
+# Interface: IDynamoDbEntityStorageConnectorConstructorOptions
+
+Options for the Dynamo DB Entity Storage Connector constructor.
+
+## Properties
+
+### entitySchema
+
+> **entitySchema**: `string`
+
+The schema for the entity
+
+***
+
+### loggingConnectorType?
+
+> `optional` **loggingConnectorType**: `string`
+
+The type of logging connector to use, defaults to no logging.
+
+***
+
+### config
+
+> **config**: [`IDynamoDbEntityStorageConnectorConfig`](IDynamoDbEntityStorageConnectorConfig.md)
+
+The configuration for the connector.

package/locales/en.json

@@ -13,7 +13,7 @@
 			"setFailed": "Unable to set entity \"{id}\"",
 			"getFailed": "Unable to get entity \"{id}\"",
 			"removeFailed": "Unable to remove entity \"{id}\"",
-			"queryFailed": "The query failed when issuing the following command \"{sql}\"",
+			"queryFailed": "The query failed",
 			"comparisonNotSupported": "Comparison operator \"{comparison}\" is not supported",
 			"conditionalNotSupported": "Conditional operator \"{operator}\" is not supported",
 			"sortSingle": "You can only sort by a single property",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/entity-storage-connector-dynamodb",
-	"version": "0.0.1-next.2",
+	"version": "0.0.1-next.21",
 	"description": "Entity Storage connector implementation using DynamoDb storage",
 	"repository": {
 		"type": "git",
@@ -13,56 +13,26 @@
 	"engines": {
 		"node": ">=20.0.0"
 	},
-	"scripts": {
-		"clean": "rimraf dist coverage docs/reference",
-		"build": "tspc",
-		"test": "vitest --run --config ./vitest.config.ts --no-cache",
-		"coverage": "vitest --run --coverage --config ./vitest.config.ts --no-cache",
-		"bundle:esm": "rollup --config rollup.config.mjs --environment MODULE:esm",
-		"bundle:cjs": "rollup --config rollup.config.mjs --environment MODULE:cjs",
-		"bundle": "npm run bundle:esm && npm run bundle:cjs",
-		"docs:clean": "rimraf docs/reference",
-		"docs:generate": "typedoc",
-		"docs": "npm run docs:clean && npm run docs:generate",
-		"dist": "npm run clean && npm run build && npm run test && npm run bundle && npm run docs"
-	},
 	"dependencies": {
+		"@aws-sdk/client-dynamodb": "3.738",
+		"@aws-sdk/lib-dynamodb": "3.738",
+		"@aws-sdk/util-dynamodb": "3.738",
 		"@twin.org/core": "next",
 		"@twin.org/entity": "next",
-		"@twin.org/nameof": "next",
-		"@twin.org/entity-storage-models": "0.0.1-next.2",
+		"@twin.org/entity-storage-models": "0.0.1-next.21",
 		"@twin.org/logging-models": "next",
-		"@aws-sdk/client-dynamodb": "3.651",
-		"@aws-sdk/lib-dynamodb": "3.651",
-		"@aws-sdk/util-dynamodb": "3.651"
-	},
-	"devDependencies": {
-		"@twin.org/entity-storage-connector-memory": "0.0.1-next.2",
-		"@twin.org/logging-connector-entity-storage": "next",
-		"@twin.org/nameof-transformer": "next",
-		"@vitest/coverage-v8": "2.1.1",
-		"copyfiles": "2.4.1",
-		"dotenv": "16.4.5",
-		"rimraf": "6.0.1",
-		"rollup": "4.21.3",
-		"rollup-plugin-copy": "3.5.0",
-		"rollup-plugin-typescript2": "0.36.0",
-		"ts-patch": "3.2.1",
-		"typedoc": "0.26.7",
-		"typedoc-plugin-markdown": "4.2.7",
-		"typescript": "5.6.2",
-		"vitest": "2.1.1"
+		"@twin.org/nameof": "next"
 	},
 	"main": "./dist/cjs/index.cjs",
 	"module": "./dist/esm/index.mjs",
 	"types": "./dist/types/index.d.ts",
 	"exports": {
 		".": {
+			"types": "./dist/types/index.d.ts",
 			"require": "./dist/cjs/index.cjs",
-			"import": "./dist/esm/index.mjs",
-			"types": "./dist/types/index.d.ts"
+			"import": "./dist/esm/index.mjs"
 		},
-		"./locales": "./locales"
+		"./locales/*.json": "./locales/*.json"
 	},
 	"files": [
 		"dist/cjs",