@twin.org/entity-storage-connector-dynamodb 0.0.1-next.6 → 0.0.1-next.7

package/dist/cjs/index.cjs

@@ -347,7 +347,6 @@ 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;
@@ -417,9 +416,7 @@ class DynamoDbEntityStorageConnector {
                     table: this._config.tableName
                 }, err);
             }
-            throw new core.GeneralError(this.CLASS_NAME, "queryFailed", {
-                sql
-            }, err);
+            throw new core.GeneralError(this.CLASS_NAME, "queryFailed", undefined, err);
         }
     }
     /**
@@ -434,7 +431,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.
@@ -451,11 +448,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 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 {

package/dist/esm/index.mjs

@@ -345,7 +345,6 @@ 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;
@@ -415,9 +414,7 @@ class DynamoDbEntityStorageConnector {
                     table: this._config.tableName
                 }, err);
             }
-            throw new GeneralError(this.CLASS_NAME, "queryFailed", {
-                sql
-            }, err);
+            throw new GeneralError(this.CLASS_NAME, "queryFailed", undefined, err);
         }
     }
     /**
@@ -432,7 +429,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.
@@ -449,11 +446,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 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 {

package/docs/changelog.md

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

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.6",
+	"version": "0.0.1-next.7",
 	"description": "Entity Storage connector implementation using DynamoDb storage",
 	"repository": {
 		"type": "git",
@@ -19,7 +19,7 @@
 		"@aws-sdk/util-dynamodb": "3.656",
 		"@twin.org/core": "next",
 		"@twin.org/entity": "next",
-		"@twin.org/entity-storage-models": "0.0.1-next.6",
+		"@twin.org/entity-storage-models": "0.0.1-next.7",
 		"@twin.org/logging-models": "next",
 		"@twin.org/nameof": "next"
 	},