fix: entity with sort fails to query without sort (#355)

Author: thantos

apps/tests/aws-runtime/test/test-service.ts

@@ -569,6 +569,11 @@ export const allCountersByN = counter.index("allCountersByN", {
   sort: ["n"],
 });
 
+export const countersByNamespace = counter.index("countersOrderedByNamespace", {
+  partition: ["id"],
+  sort: ["namespace"],
+});
+
 export const countersByN = counter.index("countersByN", {
   sort: ["n"],
 });
@@ -660,6 +665,12 @@ export const entityIndexTask = task(
           namespace: e.value.namespace,
         }))
       ),
+      countersByNamespace.query({ id }).then((q) =>
+        q.entries?.map((e) => ({
+          n: e.value.n,
+          namespace: e.value.namespace,
+        }))
+      ),
       countersByN.query({ namespace: "another", id }).then((q) =>
         q.entries?.map((e) => ({
           n: e.value.n,

apps/tests/aws-runtime/test/tester.test.ts

@@ -149,6 +149,20 @@ eventualRuntimeTestHarness(
             n: 1000,
           },
         ],
+        [
+          {
+            namespace: "another",
+            n: 1000,
+          },
+          {
+            namespace: "default",
+            n: 6,
+          },
+          {
+            namespace: "different",
+            n: 1,
+          },
+        ],
         [
           {
             namespace: "another",

packages/@eventual/aws-runtime/src/stores/entity-store.ts

@@ -15,18 +15,18 @@ import {
 } from "@aws-sdk/client-dynamodb";
 import { marshall, unmarshall } from "@aws-sdk/util-dynamodb";
 import {
-  Entity,
   Attributes,
+  Entity,
   EntityConsistencyOptions,
+  EntityIndex,
   EntityQueryOptions,
   EntityQueryResult,
+  EntityReadOptions,
   EntitySetOptions,
   EntityWithMetadata,
   TransactionCancelled,
   TransactionConflict,
   UnexpectedVersion,
-  EntityIndex,
-  EntityReadOptions,
 } from "@eventual/core";
 import {
   EntityProvider,
@@ -204,7 +204,9 @@ export class AWSEntityStore extends EntityStore {
         IndexName: entity.kind === "EntityIndex" ? entity.name : undefined,
         ConsistentRead: options?.consistentRead,
         KeyConditionExpression:
-          queryKey.sort && queryKey.sort.keyValue !== undefined
+          queryKey.sort &&
+          (queryKey.sort.keyValue !== undefined ||
+            queryKey.sort.keyValue === "")
             ? queryKey.sort.partialValue
               ? `${formatAttributeNameMapKey(
                   queryKey.partition.keyAttribute
@@ -224,7 +226,9 @@ export class AWSEntityStore extends EntityStore {
             typeof queryKey.partition.keyValue === "number"
               ? { N: queryKey.partition.keyValue.toString() }
               : { S: queryKey.partition.keyValue },
-          ...(queryKey.sort && queryKey.sort.keyValue !== undefined
+          ...(queryKey.sort &&
+          (queryKey.sort.keyValue !== undefined ||
+            queryKey.sort.keyValue === "")
             ? {
                 ":sk":
                   typeof queryKey.sort.keyValue === "string"

packages/@eventual/core-runtime/src/stores/entity-store.ts

@@ -351,12 +351,17 @@ function formatNormalizedPart(
     attributes: keyPart.attributes,
     parts,
     keyAttribute: keyPart.keyAttribute,
-    keyValue: (keyPart.type === "number"
-      ? parts[0]?.value
-      : (missingValueIndex === -1 ? parts : parts.slice(0, missingValueIndex))
-          .map((p) => p.value)
-          .join("#")) as any,
-    partialValue: missingValueIndex !== -1,
+    keyValue:
+      // if there are no present values, return undefined
+      missingValueIndex === 0
+        ? undefined
+        : keyPart.type === "number"
+        ? parts[0]!.value
+        : (missingValueIndex === -1 ? parts : parts.slice(0, missingValueIndex))
+            .map((p) => p.value)
+            .join("#"),
+    // since true is more permissive (allows undefined), hack the types here to allow any value
+    partialValue: (missingValueIndex !== -1) as true,
   };
 }