@awsless/validate 0.0.8 → 0.0.10

package/dist/index.cjs

@@ -119,17 +119,12 @@ var uuid = (error) => {
 var import_valibot5 = require("valibot");
 var import_duration = require("@awsless/duration");
 function duration(arg1, arg2) {
-  const [error, pipe] = (0, import_valibot5.getDefaultArgs)(arg1, arg2);
-  return (0, import_valibot5.union)(
-    [
-      (0, import_valibot5.transform)(
-        (0, import_valibot5.string)([(0, import_valibot5.regex)(/^[0-9]+ (milliseconds?|seconds?|minutes?|hours?|days?)/)]),
-        (value) => (0, import_duration.parse)(value),
-        pipe
-      ),
-      (0, import_valibot5.instance)(import_duration.Duration, pipe)
-    ],
-    error ?? "Invalid duration"
+  const [msg, pipe] = (0, import_valibot5.getDefaultArgs)(arg1, arg2);
+  const error = msg ?? "Invalid duration";
+  return (0, import_valibot5.transform)(
+    (0, import_valibot5.string)(error, [(0, import_valibot5.regex)(/^[0-9]+ (milliseconds?|seconds?|minutes?|hours?|days?)/, error)]),
+    (value) => (0, import_duration.parse)(value),
+    pipe
   );
 }
 
@@ -256,14 +251,10 @@ function unique(compare = (a, b) => a === b, error) {
 // src/validation/duration.ts
 var import_valibot12 = require("valibot");
 function minDuration(min, error) {
-  return (input) => {
-    return input.value >= min.value ? (0, import_valibot12.getOutput)(input) : (0, import_valibot12.getPipeIssues)("min-duration", error ?? "Invalid duration", input);
-  };
+  return (0, import_valibot12.custom)((input) => input.value >= min.value, error ?? "Invalid duration");
 }
 function maxDuration(max, error) {
-  return (input) => {
-    return input.value <= max.value ? (0, import_valibot12.getOutput)(input) : (0, import_valibot12.getPipeIssues)("max-duration", error ?? "Invalid duration", input);
-  };
+  return (0, import_valibot12.custom)((input) => input.value <= max.value, error ?? "Invalid duration");
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.d.cts

@@ -1,4 +1,5 @@
-import { BaseSchema, SchemaWithTransform, StringSchema, Output, Pipe, ErrorMessage, UnionSchema, InstanceSchema, UnknownSchema, Input, PipeResult } from 'valibot';
+import * as valibot from 'valibot';
+import { BaseSchema, SchemaWithTransform, StringSchema, Output, Pipe, ErrorMessage, UnknownSchema, Input, PipeResult } from 'valibot';
 export * from 'valibot';
 import { BigFloat } from '@awsless/big-float';
 import { UUID } from 'crypto';
@@ -22,10 +23,7 @@ declare function date(error?: ErrorMessage, pipe?: Pipe<Date>): DateSchema;
 type UuidSchema = SchemaWithTransform<StringSchema | BaseSchema<UUID>, UUID>;
 declare const uuid: (error?: ErrorMessage) => UuidSchema;
 
-type DurationSchema = UnionSchema<[
-    SchemaWithTransform<StringSchema | BaseSchema<DurationFormat, Duration>, Duration>,
-    InstanceSchema<typeof Duration>
-], Duration>;
+type DurationSchema = BaseSchema<DurationFormat, Duration>;
 declare function duration(pipe?: Pipe<Duration>): DurationSchema;
 declare function duration(error?: ErrorMessage, pipe?: Pipe<Duration>): DurationSchema;
 
@@ -69,7 +67,7 @@ declare function precision<T extends BigFloat | number>(decimals: number, error?
 
 declare function unique<T extends any[]>(compare?: (a: T[number], b: T[number]) => boolean, error?: ErrorMessage): (input: T) => PipeResult<T>;
 
-declare function minDuration<T extends Duration>(min: Duration, error?: ErrorMessage): (input: T) => PipeResult<T>;
-declare function maxDuration<T extends Duration>(max: Duration, error?: ErrorMessage): (input: T) => PipeResult<T>;
+declare function minDuration<T extends Duration>(min: Duration, error?: ErrorMessage): (input: T) => valibot.PipeResult<T>;
+declare function maxDuration<T extends Duration>(max: Duration, error?: ErrorMessage): (input: T) => valibot.PipeResult<T>;
 
 export { BigFloatSchema, DateSchema, DurationSchema, DynamoDBStreamSchema, JsonSchema, SnsTopicSchema, SqsQueueSchema, UuidSchema, bigfloat, date, duration, dynamoDbStream, json, maxDuration, minDuration, positive, precision, snsTopic, sqsQueue, unique, uuid };

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import { BaseSchema, SchemaWithTransform, StringSchema, Output, Pipe, ErrorMessage, UnionSchema, InstanceSchema, UnknownSchema, Input, PipeResult } from 'valibot';
+import * as valibot from 'valibot';
+import { BaseSchema, SchemaWithTransform, StringSchema, Output, Pipe, ErrorMessage, UnknownSchema, Input, PipeResult } from 'valibot';
 export * from 'valibot';
 import { BigFloat } from '@awsless/big-float';
 import { UUID } from 'crypto';
@@ -22,10 +23,7 @@ declare function date(error?: ErrorMessage, pipe?: Pipe<Date>): DateSchema;
 type UuidSchema = SchemaWithTransform<StringSchema | BaseSchema<UUID>, UUID>;
 declare const uuid: (error?: ErrorMessage) => UuidSchema;
 
-type DurationSchema = UnionSchema<[
-    SchemaWithTransform<StringSchema | BaseSchema<DurationFormat, Duration>, Duration>,
-    InstanceSchema<typeof Duration>
-], Duration>;
+type DurationSchema = BaseSchema<DurationFormat, Duration>;
 declare function duration(pipe?: Pipe<Duration>): DurationSchema;
 declare function duration(error?: ErrorMessage, pipe?: Pipe<Duration>): DurationSchema;
 
@@ -69,7 +67,7 @@ declare function precision<T extends BigFloat | number>(decimals: number, error?
 
 declare function unique<T extends any[]>(compare?: (a: T[number], b: T[number]) => boolean, error?: ErrorMessage): (input: T) => PipeResult<T>;
 
-declare function minDuration<T extends Duration>(min: Duration, error?: ErrorMessage): (input: T) => PipeResult<T>;
-declare function maxDuration<T extends Duration>(max: Duration, error?: ErrorMessage): (input: T) => PipeResult<T>;
+declare function minDuration<T extends Duration>(min: Duration, error?: ErrorMessage): (input: T) => valibot.PipeResult<T>;
+declare function maxDuration<T extends Duration>(max: Duration, error?: ErrorMessage): (input: T) => valibot.PipeResult<T>;
 
 export { BigFloatSchema, DateSchema, DurationSchema, DynamoDBStreamSchema, JsonSchema, SnsTopicSchema, SqsQueueSchema, UuidSchema, bigfloat, date, duration, dynamoDbStream, json, maxDuration, minDuration, positive, precision, snsTopic, sqsQueue, unique, uuid };

package/dist/index.js

@@ -94,35 +94,23 @@ var uuid = (error) => {
 };
 
 // src/schema/duration.ts
-import {
-  getDefaultArgs as getDefaultArgs3,
-  instance as instance2,
-  regex,
-  string as string5,
-  transform as transform5,
-  union as union3
-} from "valibot";
-import { Duration, parse } from "@awsless/duration";
+import { getDefaultArgs as getDefaultArgs3, regex, string as string5, transform as transform5 } from "valibot";
+import { parse } from "@awsless/duration";
 function duration(arg1, arg2) {
-  const [error, pipe] = getDefaultArgs3(arg1, arg2);
-  return union3(
-    [
-      transform5(
-        string5([regex(/^[0-9]+ (milliseconds?|seconds?|minutes?|hours?|days?)/)]),
-        (value) => parse(value),
-        pipe
-      ),
-      instance2(Duration, pipe)
-    ],
-    error ?? "Invalid duration"
+  const [msg, pipe] = getDefaultArgs3(arg1, arg2);
+  const error = msg ?? "Invalid duration";
+  return transform5(
+    string5(error, [regex(/^[0-9]+ (milliseconds?|seconds?|minutes?|hours?|days?)/, error)]),
+    (value) => parse(value),
+    pipe
   );
 }
 
 // src/schema/aws/sqs-queue.ts
-import { array, object as object2, transform as transform6, union as union4, unknown } from "valibot";
+import { array, object as object2, transform as transform6, union as union3, unknown } from "valibot";
 var sqsQueue = (body) => {
   const schema = body ?? unknown();
-  return union4(
+  return union3(
     [
       transform6(schema, (input) => [input]),
       array(schema),
@@ -144,10 +132,10 @@ var sqsQueue = (body) => {
 };
 
 // src/schema/aws/sns-topic.ts
-import { array as array2, object as object3, transform as transform7, union as union5, unknown as unknown2 } from "valibot";
+import { array as array2, object as object3, transform as transform7, union as union4, unknown as unknown2 } from "valibot";
 var snsTopic = (body) => {
   const schema = body ?? unknown2();
-  return union5(
+  return union4(
     [
       transform7(schema, (input) => [input]),
       array2(schema),
@@ -239,16 +227,12 @@ function unique(compare = (a, b) => a === b, error) {
 }
 
 // src/validation/duration.ts
-import { getOutput as getOutput5, getPipeIssues as getPipeIssues5 } from "valibot";
+import { custom } from "valibot";
 function minDuration(min, error) {
-  return (input) => {
-    return input.value >= min.value ? getOutput5(input) : getPipeIssues5("min-duration", error ?? "Invalid duration", input);
-  };
+  return custom((input) => input.value >= min.value, error ?? "Invalid duration");
 }
 function maxDuration(max, error) {
-  return (input) => {
-    return input.value <= max.value ? getOutput5(input) : getPipeIssues5("max-duration", error ?? "Invalid duration", input);
-  };
+  return custom((input) => input.value <= max.value, error ?? "Invalid duration");
 }
 export {
   bigfloat,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/validate",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -30,8 +30,8 @@
   },
   "devDependencies": {
     "@awsless/big-float": "^0.0.4",
-    "@awsless/duration": "^0.0.1",
-    "@awsless/dynamodb": "^0.0.40"
+    "@awsless/dynamodb": "^0.0.40",
+    "@awsless/duration": "^0.0.1"
   },
   "dependencies": {
     "valibot": "^0.20.1"