electrodb 3.4.1 → 3.4.3

package/index.d.ts

@@ -1236,10 +1236,10 @@ export interface RecordsActionOptions<
   F extends string,
   C extends string,
   S extends Schema<A, F, C>,
-  Items,
+  ResponseItem,
   IndexCompositeAttributes,
 > {
-  go: QueryRecordsGo<Items>;
+  go: QueryRecordsGo<ResponseItem>;
   params: ParamRecord;
   where: WhereClause<
     A,
@@ -1247,7 +1247,7 @@ export interface RecordsActionOptions<
     C,
     S,
     Item<A, F, C, S, S["attributes"]>,
-    RecordsActionOptions<A, F, C, S, Items, IndexCompositeAttributes>
+    RecordsActionOptions<A, F, C, S, ResponseItem, IndexCompositeAttributes>
   >;
 }
 
@@ -2537,7 +2537,6 @@ export interface QueryOptions {
   logger?: ElectroEventListener;
   data?: "raw" | "includeKeys" | "attributes";
   order?: "asc" | "desc";
-
   consistent?: boolean;
 }
 
@@ -2855,11 +2854,16 @@ export type ServiceQueryRecordsGo<
   options?: Options,
 ) => Promise<{ data: T; cursor: string | null }>;
 
-export type QueryRecordsGo<ResponseType, Options = QueryOptions> = <
-  T = ResponseType,
->(
+export type QueryRecordsGo<Item> = <Options extends GoQueryTerminalOptions<keyof Item>>(
   options?: Options,
-) => Promise<{ data: T; cursor: string | null }>;
+) => Options extends GoQueryTerminalOptions<infer Attr>
+  ? Promise<{
+      data: Array<{
+        [Name in keyof Item as Name extends Attr ? Name : never]: Item[Name];
+      }>;
+      cursor: string | null;
+    }>
+  : Promise<{ data: Array<Item>; cursor: string | null }>;
 
 export type UpdateRecordGo<ResponseType, Keys> = <
   T = ResponseType,
@@ -5255,7 +5259,7 @@ export class Entity<
     F,
     C,
     S,
-    ResponseItem<A, F, C, S>[],
+    ResponseItem<A, F, C, S>,
     AllTableIndexCompositeAttributes<A, F, C, S>
   >;
 
@@ -5266,7 +5270,7 @@ export class Entity<
     F,
     C,
     S,
-    ResponseItem<A, F, C, S>[],
+    ResponseItem<A, F, C, S>,
     AllTableIndexCompositeAttributes<A, F, C, S>
   >;
 
@@ -5275,7 +5279,7 @@ export class Entity<
     F,
     C,
     S,
-    ResponseItem<A, F, C, S>[],
+    ResponseItem<A, F, C, S>,
     TableIndexCompositeAttributes<A, F, C, S>
   >;
   query: Queries<A, F, C, S>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electrodb",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "description": "A library to more easily create and interact with multiple entities and heretical relationships in dynamodb",
   "main": "index.js",
   "scripts": {

package/src/entity.js

@@ -943,9 +943,6 @@ class Entity {
               response.Item,
               config,
             );
-            if (Object.keys(results).length === 0 && !config._objectOnEmpty) {
-              results = null;
-            }
           } else if (!config._objectOnEmpty) {
             results = null;
           }
@@ -965,9 +962,7 @@ class Entity {
                 item,
                 config,
               );
-              if (Object.keys(record).length > 0 || config._objectOnEmpty) {
-                results.push(record);
-              }
+              results.push(record);
             }
           }
         } else if (response.Attributes) {
@@ -1732,9 +1727,6 @@ class Entity {
 
       if (Array.isArray(option.attributes)) {
         config.attributes = config.attributes.concat(option.attributes);
-        if (config.attributes.length > 0) {
-          config._objectOnEmpty = true;
-        }
       }
 
       if (option.preserveBatchOrder === true) {