@awsless/validate 0.0.16 → 0.0.18

package/dist/index.cjs

@@ -40,13 +40,14 @@ module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("valibot"), module.exports);
 
 // src/schema/json.ts
+var import_json = require("@awsless/json");
 var import_valibot = require("valibot");
 var json = (schema) => {
   return (0, import_valibot.transform)(
     (0, import_valibot.string)(),
     (value) => {
       try {
-        return JSON.parse(value);
+        return (0, import_json.parse)(value);
       } catch (error) {
         return null;
       }
@@ -121,22 +122,25 @@ function date(arg1, arg2) {
 // src/schema/uuid.ts
 var import_valibot5 = require("valibot");
 var uuid = (error) => {
-  return (0, import_valibot5.transform)((0, import_valibot5.string)(error ?? "Invalid UUID", [(0, import_valibot5.uuid)()]), (v) => v);
+  return (0, import_valibot5.string)(error ?? "Invalid UUID", [(0, import_valibot5.uuid)()]);
 };
 
 // src/schema/duration.ts
-var import_valibot6 = require("valibot");
 var import_duration = require("@awsless/duration");
+var import_valibot6 = require("valibot");
 function duration(arg1, arg2) {
   const [msg, pipe] = (0, import_valibot6.defaultArgs)(arg1, arg2);
   const error = msg ?? "Invalid duration";
-  return (0, import_valibot6.transform)(
-    (0, import_valibot6.string)(error, [(0, import_valibot6.regex)(/^[0-9]+ (milliseconds?|seconds?|minutes?|hours?|days?)/, error)]),
-    (value) => {
-      return (0, import_duration.parse)(value);
-    },
-    pipe
-  );
+  return (0, import_valibot6.union)([
+    (0, import_valibot6.instance)(import_duration.Duration, pipe),
+    (0, import_valibot6.transform)(
+      (0, import_valibot6.string)(error, [(0, import_valibot6.regex)(/^[0-9]+ (milliseconds?|seconds?|minutes?|hours?|days?|weeks?)/, error)]),
+      (value) => {
+        return (0, import_duration.parse)(value);
+      },
+      pipe
+    )
+  ]);
 }
 
 // src/schema/aws/sqs-queue.ts

package/dist/index.d.cts

@@ -24,10 +24,10 @@ type DateSchema = BaseSchema<string | Date, Date>;
 declare function date(pipe?: Pipe<Date>): DateSchema;
 declare function date(error?: ErrorMessage, pipe?: Pipe<Date>): DateSchema;
 
-type UuidSchema = SchemaWithTransform<StringSchema, UUID>;
+type UuidSchema = BaseSchema<UUID, UUID>;
 declare const uuid: (error?: ErrorMessage) => UuidSchema;
 
-type DurationSchema = BaseSchema<DurationFormat, Duration>;
+type DurationSchema = BaseSchema<DurationFormat | Duration, Duration>;
 declare function duration(pipe?: Pipe<Duration>): DurationSchema;
 declare function duration(error?: ErrorMessage, pipe?: Pipe<Duration>): DurationSchema;
 

package/dist/index.d.ts

@@ -24,10 +24,10 @@ type DateSchema = BaseSchema<string | Date, Date>;
 declare function date(pipe?: Pipe<Date>): DateSchema;
 declare function date(error?: ErrorMessage, pipe?: Pipe<Date>): DateSchema;
 
-type UuidSchema = SchemaWithTransform<StringSchema, UUID>;
+type UuidSchema = BaseSchema<UUID, UUID>;
 declare const uuid: (error?: ErrorMessage) => UuidSchema;
 
-type DurationSchema = BaseSchema<DurationFormat, Duration>;
+type DurationSchema = BaseSchema<DurationFormat | Duration, Duration>;
 declare function duration(pipe?: Pipe<Duration>): DurationSchema;
 declare function duration(error?: ErrorMessage, pipe?: Pipe<Duration>): DurationSchema;
 

package/dist/index.js

@@ -2,13 +2,14 @@
 export * from "valibot";
 
 // src/schema/json.ts
+import { parse } from "@awsless/json";
 import { string, transform } from "valibot";
 var json = (schema) => {
   return transform(
     string(),
     (value) => {
       try {
-        return JSON.parse(value);
+        return parse(value);
       } catch (error) {
         return null;
       }
@@ -21,14 +22,14 @@ var json = (schema) => {
 import { BigFloat } from "@awsless/big-float";
 import {
   bigint,
+  custom,
   defaultArgs,
   instance,
   number,
   object,
   string as string2,
   transform as transform2,
-  union,
-  custom
+  union
 } from "valibot";
 var make = (value) => new BigFloat(value);
 function bigfloat(arg1, arg2) {
@@ -91,35 +92,38 @@ function date(arg1, arg2) {
 }
 
 // src/schema/uuid.ts
-import { string as string5, uuid as base3, transform as transform5 } from "valibot";
+import { uuid as base3, string as string5 } from "valibot";
 var uuid = (error) => {
-  return transform5(string5(error ?? "Invalid UUID", [base3()]), (v) => v);
+  return string5(error ?? "Invalid UUID", [base3()]);
 };
 
 // src/schema/duration.ts
-import { defaultArgs as defaultArgs4, regex as regex2, string as string6, transform as transform6 } from "valibot";
-import { parse } from "@awsless/duration";
+import { Duration, parse as parse2 } from "@awsless/duration";
+import { defaultArgs as defaultArgs4, instance as instance2, regex as regex2, string as string6, transform as transform5, union as union4 } from "valibot";
 function duration(arg1, arg2) {
   const [msg, pipe] = defaultArgs4(arg1, arg2);
   const error = msg ?? "Invalid duration";
-  return transform6(
-    string6(error, [regex2(/^[0-9]+ (milliseconds?|seconds?|minutes?|hours?|days?)/, error)]),
-    (value) => {
-      return parse(value);
-    },
-    pipe
-  );
+  return union4([
+    instance2(Duration, pipe),
+    transform5(
+      string6(error, [regex2(/^[0-9]+ (milliseconds?|seconds?|minutes?|hours?|days?|weeks?)/, error)]),
+      (value) => {
+        return parse2(value);
+      },
+      pipe
+    )
+  ]);
 }
 
 // src/schema/aws/sqs-queue.ts
-import { array, object as object2, transform as transform7, union as union4, unknown } from "valibot";
+import { array, object as object2, transform as transform6, union as union5, unknown } from "valibot";
 var sqsQueue = (body) => {
   const schema = body ?? unknown();
-  return union4(
+  return union5(
     [
-      transform7(schema, (input) => [input]),
+      transform6(schema, (input) => [input]),
       array(schema),
-      transform7(
+      transform6(
         object2({
           Records: array(
             object2({
@@ -137,14 +141,14 @@ var sqsQueue = (body) => {
 };
 
 // src/schema/aws/sns-topic.ts
-import { array as array2, object as object3, transform as transform8, union as union5, unknown as unknown2 } from "valibot";
+import { array as array2, object as object3, transform as transform7, union as union6, unknown as unknown2 } from "valibot";
 var snsTopic = (body) => {
   const schema = body ?? unknown2();
-  return union5(
+  return union6(
     [
-      transform8(schema, (input) => [input]),
+      transform7(schema, (input) => [input]),
       array2(schema),
-      transform8(
+      transform7(
         object3({
           Records: array2(
             object3({
@@ -164,17 +168,17 @@ var snsTopic = (body) => {
 };
 
 // src/schema/aws/dynamodb-stream.ts
-import { array as array3, literal, object as object4, optional, transform as transform9, union as union6, unknown as unknown3 } from "valibot";
+import { array as array3, literal, object as object4, optional, transform as transform8, union as union7, unknown as unknown3 } from "valibot";
 var dynamoDbStream = (table) => {
-  const marshall = () => transform9(unknown3(), (value) => table.unmarshall(value));
-  return transform9(
+  const marshall = () => transform8(unknown3(), (value) => table.unmarshall(value));
+  return transform8(
     object4(
       {
         Records: array3(
           object4({
             // For some reason picklist fails to build.
             // eventName: picklist(['MODIFY', 'INSERT', 'REMOVE']),
-            eventName: union6([literal("MODIFY"), literal("INSERT"), literal("REMOVE")]),
+            eventName: union7([literal("MODIFY"), literal("INSERT"), literal("REMOVE")]),
             dynamodb: object4({
               Keys: marshall(),
               OldImage: optional(marshall()),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/validate",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -25,13 +25,15 @@
   },
   "peerDependencies": {
     "@awsless/big-float": "^0.0.4",
-    "@awsless/dynamodb": "^0.1.1",
-    "@awsless/duration": "^0.0.1"
+    "@awsless/duration": "^0.0.2",
+    "@awsless/json": "^0.0.7",
+    "@awsless/dynamodb": "^0.1.5"
   },
   "devDependencies": {
     "@awsless/big-float": "^0.0.4",
-    "@awsless/dynamodb": "^0.1.1",
-    "@awsless/duration": "^0.0.1"
+    "@awsless/dynamodb": "^0.1.5",
+    "@awsless/json": "^0.0.7",
+    "@awsless/duration": "^0.0.2"
   },
   "dependencies": {
     "valibot": "^0.30.0"