@awsless/validate 0.0.20 → 0.0.22

package/dist/index.cjs

@@ -189,34 +189,52 @@ var snsTopic = (body) => {
 // src/schema/aws/dynamodb-stream.ts
 var import_valibot9 = require("valibot");
 var dynamoDbStream = (table) => {
-  const marshall = () => (0, import_valibot9.transform)((0, import_valibot9.unknown)(), (value) => table.unmarshall(value));
+  const unmarshall = () => (0, import_valibot9.transform)((0, import_valibot9.unknown)(), (value) => table.unmarshall(value));
   return (0, import_valibot9.transform)(
     (0, import_valibot9.object)(
       {
         Records: (0, import_valibot9.array)(
-          (0, import_valibot9.object)({
-            // For some reason picklist fails to build.
-            // eventName: picklist(['MODIFY', 'INSERT', 'REMOVE']),
-            eventName: (0, import_valibot9.union)([(0, import_valibot9.literal)("MODIFY"), (0, import_valibot9.literal)("INSERT"), (0, import_valibot9.literal)("REMOVE")]),
-            dynamodb: (0, import_valibot9.object)({
-              Keys: marshall(),
-              OldImage: (0, import_valibot9.optional)(marshall()),
-              NewImage: (0, import_valibot9.optional)(marshall())
+          (0, import_valibot9.variant)("eventName", [
+            (0, import_valibot9.object)({
+              eventName: (0, import_valibot9.literal)("MODIFY"),
+              dynamodb: (0, import_valibot9.object)({
+                Keys: unmarshall(),
+                OldImage: unmarshall(),
+                NewImage: unmarshall()
+              })
+            }),
+            (0, import_valibot9.object)({
+              eventName: (0, import_valibot9.literal)("INSERT"),
+              dynamodb: (0, import_valibot9.object)({
+                Keys: unmarshall(),
+                NewImage: unmarshall()
+              })
+            }),
+            (0, import_valibot9.object)({
+              eventName: (0, import_valibot9.literal)("REMOVE"),
+              dynamodb: (0, import_valibot9.object)({
+                Keys: unmarshall(),
+                OldImage: unmarshall()
+              })
             })
-          })
+          ])
         )
       },
       "Invalid DynamoDB Stream input"
     ),
     (input) => {
       return input.Records.map((record) => {
-        const item = record;
-        return {
+        const item = {
           event: record.eventName.toLowerCase(),
-          keys: item.dynamodb.Keys,
-          old: item.dynamodb.OldImage,
-          new: item.dynamodb.NewImage
+          keys: record.dynamodb.Keys
         };
+        if ("OldImage" in record.dynamodb) {
+          item.old = record.dynamodb.OldImage;
+        }
+        if ("NewImage" in record.dynamodb) {
+          item.new = record.dynamodb.NewImage;
+        }
+        return item;
       });
     }
   );

package/dist/index.d.cts

@@ -47,22 +47,41 @@ type SnsTopicSchema<S extends BaseSchema = UnknownSchema> = BaseSchema<Input<S>
 }, Output<S>[]>;
 declare const snsTopic: <S extends BaseSchema = UnknownSchema>(body?: S) => SnsTopicSchema<S>;
 
-type EventName = 'MODIFY' | 'INSERT' | 'REMOVE';
 type DynamoDBStreamSchema<T extends AnyTable> = BaseSchema<{
-    Records: {
-        eventName: EventName;
+    Records: Array<{
+        eventName: 'MODIFY';
         dynamodb: {
             Keys: unknown;
-            OldImage?: unknown;
-            NewImage?: unknown;
+            OldImage: unknown;
+            NewImage: unknown;
         };
-    }[];
-}, {
-    event: Lowercase<EventName>;
+    } | {
+        eventName: 'INSERT';
+        dynamodb: {
+            Keys: unknown;
+            NewImage: unknown;
+        };
+    } | {
+        eventName: 'REMOVE';
+        dynamodb: {
+            Keys: unknown;
+            OldImage: unknown;
+        };
+    }>;
+}, Array<{
+    event: 'modify';
+    keys: PrimaryKey<T>;
+    old: Infer<T>;
+    new: Infer<T>;
+} | {
+    event: 'insert';
+    keys: PrimaryKey<T>;
+    new: Infer<T>;
+} | {
+    event: 'remove';
     keys: PrimaryKey<T>;
-    old?: Infer<T>;
-    new?: Infer<T>;
-}[]>;
+    old: Infer<T>;
+}>>;
 declare const dynamoDbStream: <T extends AnyTable>(table: T) => DynamoDBStreamSchema<T>;
 
 declare function positive<T extends BigFloat | number>(error?: ErrorMessage): valibot.CustomValidation<T>;

package/dist/index.d.ts

@@ -47,22 +47,41 @@ type SnsTopicSchema<S extends BaseSchema = UnknownSchema> = BaseSchema<Input<S>
 }, Output<S>[]>;
 declare const snsTopic: <S extends BaseSchema = UnknownSchema>(body?: S) => SnsTopicSchema<S>;
 
-type EventName = 'MODIFY' | 'INSERT' | 'REMOVE';
 type DynamoDBStreamSchema<T extends AnyTable> = BaseSchema<{
-    Records: {
-        eventName: EventName;
+    Records: Array<{
+        eventName: 'MODIFY';
         dynamodb: {
             Keys: unknown;
-            OldImage?: unknown;
-            NewImage?: unknown;
+            OldImage: unknown;
+            NewImage: unknown;
         };
-    }[];
-}, {
-    event: Lowercase<EventName>;
+    } | {
+        eventName: 'INSERT';
+        dynamodb: {
+            Keys: unknown;
+            NewImage: unknown;
+        };
+    } | {
+        eventName: 'REMOVE';
+        dynamodb: {
+            Keys: unknown;
+            OldImage: unknown;
+        };
+    }>;
+}, Array<{
+    event: 'modify';
+    keys: PrimaryKey<T>;
+    old: Infer<T>;
+    new: Infer<T>;
+} | {
+    event: 'insert';
+    keys: PrimaryKey<T>;
+    new: Infer<T>;
+} | {
+    event: 'remove';
     keys: PrimaryKey<T>;
-    old?: Infer<T>;
-    new?: Infer<T>;
-}[]>;
+    old: Infer<T>;
+}>>;
 declare const dynamoDbStream: <T extends AnyTable>(table: T) => DynamoDBStreamSchema<T>;
 
 declare function positive<T extends BigFloat | number>(error?: ErrorMessage): valibot.CustomValidation<T>;

package/dist/index.js

@@ -159,36 +159,54 @@ var snsTopic = (body) => {
 };
 
 // src/schema/aws/dynamodb-stream.ts
-import { array as array3, literal, object as object4, optional, transform as transform7, union as union6, unknown as unknown3 } from "valibot";
+import { array as array3, literal, object as object4, transform as transform7, unknown as unknown3, variant } from "valibot";
 var dynamoDbStream = (table) => {
-  const marshall = () => transform7(unknown3(), (value) => table.unmarshall(value));
+  const unmarshall = () => transform7(unknown3(), (value) => table.unmarshall(value));
   return transform7(
     object4(
       {
         Records: array3(
-          object4({
-            // For some reason picklist fails to build.
-            // eventName: picklist(['MODIFY', 'INSERT', 'REMOVE']),
-            eventName: union6([literal("MODIFY"), literal("INSERT"), literal("REMOVE")]),
-            dynamodb: object4({
-              Keys: marshall(),
-              OldImage: optional(marshall()),
-              NewImage: optional(marshall())
+          variant("eventName", [
+            object4({
+              eventName: literal("MODIFY"),
+              dynamodb: object4({
+                Keys: unmarshall(),
+                OldImage: unmarshall(),
+                NewImage: unmarshall()
+              })
+            }),
+            object4({
+              eventName: literal("INSERT"),
+              dynamodb: object4({
+                Keys: unmarshall(),
+                NewImage: unmarshall()
+              })
+            }),
+            object4({
+              eventName: literal("REMOVE"),
+              dynamodb: object4({
+                Keys: unmarshall(),
+                OldImage: unmarshall()
+              })
             })
-          })
+          ])
         )
       },
       "Invalid DynamoDB Stream input"
     ),
     (input) => {
       return input.Records.map((record) => {
-        const item = record;
-        return {
+        const item = {
           event: record.eventName.toLowerCase(),
-          keys: item.dynamodb.Keys,
-          old: item.dynamodb.OldImage,
-          new: item.dynamodb.NewImage
+          keys: record.dynamodb.Keys
         };
+        if ("OldImage" in record.dynamodb) {
+          item.old = record.dynamodb.OldImage;
+        }
+        if ("NewImage" in record.dynamodb) {
+          item.new = record.dynamodb.NewImage;
+        }
+        return item;
       });
     }
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/validate",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -25,15 +25,15 @@
   },
   "peerDependencies": {
     "@awsless/big-float": "^0.1.5",
-    "@awsless/duration": "^0.0.3",
-    "@awsless/dynamodb": "^0.2.12",
+    "@awsless/dynamodb": "^0.2.14",
+    "@awsless/duration": "^0.0.4",
     "@awsless/json": "^0.0.10"
   },
   "devDependencies": {
     "@awsless/big-float": "^0.1.5",
-    "@awsless/duration": "^0.0.3",
+    "@awsless/dynamodb": "^0.2.14",
     "@awsless/json": "^0.0.10",
-    "@awsless/dynamodb": "^0.2.12"
+    "@awsless/duration": "^0.0.4"
   },
   "dependencies": {
     "valibot": "^0.30.0"