Merge a25bc54 into dc2f443

tgandrews · Mar 2, 2023 · b39b7e1 · b39b7e1
2 parents dc2f443 + a25bc54
commit b39b7e1
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 10 deletions.
diff --git a/src/index.test.ts b/src/index.test.ts
@@ -325,6 +325,72 @@ describe("omanyd", () => {
       expect(readThing?.a.b.date).toBeInstanceOf(Date);
       expect(readThing?.a.b.date).toEqual(new Date("2023-03-02T11:49:00.000Z"));
     });
+
+    it("should save and return dates nested within arrays", async () => {
+      interface Thing {
+        id: string;
+        list: {
+          date: Date;
+        }[];
+      }
+      const ThingStore = Omanyd.define<Thing>({
+        name: "arrayNestedDate",
+        hashKey: "id",
+        schema: Joi.object({
+          id: Omanyd.types.id(),
+          list: Joi.array()
+            .items(
+              Joi.object({
+                date: Joi.date().required(),
+              }).required()
+            )
+            .required(),
+        }),
+      });
+
+      await Omanyd.createTables();
+
+      const savedThing = await ThingStore.create({
+        list: [
+          {
+            date: new Date("2023-03-02T11:49:00.000Z"),
+          },
+        ],
+      });
+      const readThing = await ThingStore.getByHashKey(savedThing.id);
+      expect(savedThing.list[0].date).toBeInstanceOf(Date);
+      expect(savedThing.list[0].date).toEqual(
+        new Date("2023-03-02T11:49:00.000Z")
+      );
+      expect(readThing?.list[0].date).toBeInstanceOf(Date);
+      expect(readThing?.list[0].date).toEqual(
+        new Date("2023-03-02T11:49:00.000Z")
+      );
+    });
+
+    it("should save and return arrays with no schema", async () => {
+      interface Thing {
+        id: string;
+        list: number[];
+      }
+      const ThingStore = Omanyd.define<Thing>({
+        name: "arraysOfNumbers",
+        hashKey: "id",
+        schema: Joi.object({
+          id: Omanyd.types.id(),
+          list: Joi.array().required(),
+        }),
+      });
+
+      await Omanyd.createTables();
+
+      const savedThing = await ThingStore.create({
+        list: [123, 456, 789],
+      });
+      const readThing = await ThingStore.getByHashKey(savedThing.id);
+      expect(savedThing.list).toStrictEqual([123, 456, 789]);
+      expect(readThing?.list).toStrictEqual([123, 456, 789]);
+    });
   });
 
   describe("range key", () => {

diff --git a/src/serializer.ts b/src/serializer.ts
@@ -52,17 +52,26 @@ class Serializer {
       return undefined;
     }
 
-    const meta = schema.describe().metas?.[0]?.type;
-    switch (meta) {
-      case "SS":
-        return { SS: a };
-      default:
-        return {
-          L: a
-            .map((item) => this.any(item))
-            .filter(Boolean) as AWSDDB.AttributeValue[],
-        };
+    const description = schema.describe();
+    const meta = description.metas?.[0]?.type;
+    if (meta === "SS") {
+      return { SS: a };
     }
+
+    const itemsSchema = schema.$_terms.items[0];
+    if (itemsSchema) {
+      return {
+        L: a
+          .map((item) => this.toDynamoValue(item, itemsSchema))
+          .filter(Boolean) as AWSDDB.AttributeValue[],
+      };
+    }
+
+    return {
+      L: a
+        .map((item) => this.any(item))
+        .filter(Boolean) as AWSDDB.AttributeValue[],
+    };
   }
 
   private any(value: any): AWSDDB.AttributeValue | undefined {