@awsless/validate 0.0.10 → 0.0.11

package/dist/index.cjs

@@ -59,23 +59,12 @@ var import_big_float = require("@awsless/big-float");
 var import_valibot2 = require("valibot");
 var make = (value) => new import_big_float.BigFloat(value);
 function bigfloat(arg1, arg2) {
-  const [msg, pipe] = (0, import_valibot2.getDefaultArgs)(arg1, arg2);
+  const [msg, pipe] = (0, import_valibot2.defaultArgs)(arg1, arg2);
   const error = msg ?? "Invalid bigfloat";
   return (0, import_valibot2.union)(
     [
       (0, import_valibot2.instance)(import_big_float.BigFloat, pipe),
-      (0, import_valibot2.transform)(
-        (0, import_valibot2.string)([
-          (input) => {
-            if (input === "" || isNaN(Number(input))) {
-              return (0, import_valibot2.getPipeIssues)("bigfloat", error, input);
-            }
-            return (0, import_valibot2.getOutput)(input);
-          }
-        ]),
-        make,
-        pipe
-      ),
+      (0, import_valibot2.transform)((0, import_valibot2.string)([(0, import_valibot2.custom)((input) => input !== "" && !isNaN(Number(input)), error)]), make, pipe),
       (0, import_valibot2.transform)((0, import_valibot2.number)(), make, pipe),
       (0, import_valibot2.transform)(
         (0, import_valibot2.object)({
@@ -93,7 +82,7 @@ function bigfloat(arg1, arg2) {
 // src/schema/date.ts
 var import_valibot3 = require("valibot");
 function date(arg1, arg2) {
-  const [error, pipe] = (0, import_valibot3.getDefaultArgs)(arg1, arg2);
+  const [error, pipe] = (0, import_valibot3.defaultArgs)(arg1, arg2);
   return (0, import_valibot3.union)(
     [
       (0, import_valibot3.date)(pipe),
@@ -119,11 +108,15 @@ var uuid = (error) => {
 var import_valibot5 = require("valibot");
 var import_duration = require("@awsless/duration");
 function duration(arg1, arg2) {
-  const [msg, pipe] = (0, import_valibot5.getDefaultArgs)(arg1, arg2);
+  const [msg, pipe] = (0, import_valibot5.defaultArgs)(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),
+    (value, { issues }) => {
+      if (issues)
+        return;
+      return (0, import_duration.parse)(value);
+    },
     pipe
   );
 }
@@ -182,6 +175,12 @@ var snsTopic = (body) => {
 
 // src/schema/aws/dynamodb-stream.ts
 var import_valibot8 = require("valibot");
+var EventName = /* @__PURE__ */ ((EventName2) => {
+  EventName2["modify"] = "MODIFY";
+  EventName2["insert"] = "INSERT";
+  EventName2["remove"] = "REMOVE";
+  return EventName2;
+})(EventName || {});
 var dynamoDbStream = (table) => {
   const marshall = () => (0, import_valibot8.transform)((0, import_valibot8.unknown)(), (value) => table.unmarshall(value));
   return (0, import_valibot8.transform)(
@@ -189,7 +188,8 @@ var dynamoDbStream = (table) => {
       {
         Records: (0, import_valibot8.array)(
           (0, import_valibot8.object)({
-            eventName: (0, import_valibot8.picklist)(["MODIFY", "INSERT", "REMOVE"]),
+            eventName: (0, import_valibot8.enum_)(EventName),
+            // eventName: picklist(['MODIFY', 'INSERT', 'REMOVE']),
             dynamodb: (0, import_valibot8.object)({
               Keys: marshall(),
               OldImage: (0, import_valibot8.optional)(marshall()),
@@ -218,34 +218,32 @@ var dynamoDbStream = (table) => {
 var import_big_float2 = require("@awsless/big-float");
 var import_valibot9 = require("valibot");
 function positive(error) {
-  return (input) => {
-    return (0, import_big_float2.gt)(input, import_big_float2.ZERO) ? (0, import_valibot9.getOutput)(input) : (0, import_valibot9.getPipeIssues)("positive", error ?? "Invalid positive number", input);
-  };
+  return (0, import_valibot9.custom)((input) => (0, import_big_float2.gt)(input, import_big_float2.ZERO), error ?? "Invalid positive number");
 }
 
 // src/validation/precision.ts
 var import_big_float3 = require("@awsless/big-float");
 var import_valibot10 = require("valibot");
 function precision(decimals, error) {
-  return (input) => {
+  return (0, import_valibot10.custom)((input) => {
     const big = new import_big_float3.BigFloat(input.toString());
-    return -big.exponent <= decimals ? (0, import_valibot10.getOutput)(input) : (0, import_valibot10.getPipeIssues)("precision", error ?? `Invalid ${decimals} precision number`, input);
-  };
+    return -big.exponent <= decimals;
+  }, error ?? `Invalid ${decimals} precision number`);
 }
 
 // src/validation/unique.ts
 var import_valibot11 = require("valibot");
 function unique(compare = (a, b) => a === b, error) {
-  return (input) => {
+  return (0, import_valibot11.custom)((input) => {
     for (const x in input) {
       for (const y in input) {
         if (x !== y && compare(input[x], input[y])) {
-          return (0, import_valibot11.getPipeIssues)("unique", error ?? "None unique array", input);
+          return false;
         }
       }
     }
-    return (0, import_valibot11.getOutput)(input);
-  };
+    return true;
+  }, error ?? "None unique array");
 }
 
 // src/validation/duration.ts

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as valibot from 'valibot';
-import { BaseSchema, SchemaWithTransform, StringSchema, Output, Pipe, ErrorMessage, UnknownSchema, Input, PipeResult } from 'valibot';
+import { BaseSchema, SchemaWithTransform, StringSchema, Output, Pipe, ErrorMessage, UnknownSchema, Input } from 'valibot';
 export * from 'valibot';
 import { BigFloat } from '@awsless/big-float';
 import { UUID } from 'crypto';
@@ -20,7 +20,7 @@ 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 | BaseSchema<UUID>, UUID>;
+type UuidSchema = SchemaWithTransform<StringSchema, UUID>;
 declare const uuid: (error?: ErrorMessage) => UuidSchema;
 
 type DurationSchema = BaseSchema<DurationFormat, Duration>;
@@ -43,7 +43,11 @@ type SnsTopicSchema<S extends BaseSchema = UnknownSchema> = BaseSchema<Input<S>
 }, Output<S>[]>;
 declare const snsTopic: <S extends BaseSchema<any, any> = UnknownSchema<unknown>>(body?: S | undefined) => SnsTopicSchema<S>;
 
-type EventName = 'MODIFY' | 'INSERT' | 'REMOVE';
+declare enum EventName {
+    modify = "MODIFY",
+    insert = "INSERT",
+    remove = "REMOVE"
+}
 type DynamoDBStreamSchema<T extends TableDefinition<any, any, any, any>> = BaseSchema<{
     Records: {
         eventName: EventName;
@@ -61,13 +65,13 @@ type DynamoDBStreamSchema<T extends TableDefinition<any, any, any, any>> = BaseS
 }[]>;
 declare const dynamoDbStream: <T extends TableDefinition<any, any, any, any>>(table: T) => DynamoDBStreamSchema<T>;
 
-declare function positive<T extends BigFloat | number>(error?: ErrorMessage): (input: T) => PipeResult<T>;
+declare function positive<T extends BigFloat | number>(error?: ErrorMessage): valibot.CustomValidation<T>;
 
-declare function precision<T extends BigFloat | number>(decimals: number, error?: ErrorMessage): (input: T) => PipeResult<T>;
+declare function precision<T extends BigFloat | number>(decimals: number, error?: ErrorMessage): valibot.CustomValidation<T>;
 
-declare function unique<T extends any[]>(compare?: (a: T[number], b: T[number]) => boolean, error?: ErrorMessage): (input: T) => PipeResult<T>;
+declare function unique<T extends any[]>(compare?: (a: T[number], b: T[number]) => boolean, error?: ErrorMessage): valibot.CustomValidation<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>;
+declare function minDuration<T extends Duration>(min: Duration, error?: ErrorMessage): valibot.CustomValidation<T>;
+declare function maxDuration<T extends Duration>(max: Duration, error?: ErrorMessage): valibot.CustomValidation<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,5 +1,5 @@
 import * as valibot from 'valibot';
-import { BaseSchema, SchemaWithTransform, StringSchema, Output, Pipe, ErrorMessage, UnknownSchema, Input, PipeResult } from 'valibot';
+import { BaseSchema, SchemaWithTransform, StringSchema, Output, Pipe, ErrorMessage, UnknownSchema, Input } from 'valibot';
 export * from 'valibot';
 import { BigFloat } from '@awsless/big-float';
 import { UUID } from 'crypto';
@@ -20,7 +20,7 @@ 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 | BaseSchema<UUID>, UUID>;
+type UuidSchema = SchemaWithTransform<StringSchema, UUID>;
 declare const uuid: (error?: ErrorMessage) => UuidSchema;
 
 type DurationSchema = BaseSchema<DurationFormat, Duration>;
@@ -43,7 +43,11 @@ type SnsTopicSchema<S extends BaseSchema = UnknownSchema> = BaseSchema<Input<S>
 }, Output<S>[]>;
 declare const snsTopic: <S extends BaseSchema<any, any> = UnknownSchema<unknown>>(body?: S | undefined) => SnsTopicSchema<S>;
 
-type EventName = 'MODIFY' | 'INSERT' | 'REMOVE';
+declare enum EventName {
+    modify = "MODIFY",
+    insert = "INSERT",
+    remove = "REMOVE"
+}
 type DynamoDBStreamSchema<T extends TableDefinition<any, any, any, any>> = BaseSchema<{
     Records: {
         eventName: EventName;
@@ -61,13 +65,13 @@ type DynamoDBStreamSchema<T extends TableDefinition<any, any, any, any>> = BaseS
 }[]>;
 declare const dynamoDbStream: <T extends TableDefinition<any, any, any, any>>(table: T) => DynamoDBStreamSchema<T>;
 
-declare function positive<T extends BigFloat | number>(error?: ErrorMessage): (input: T) => PipeResult<T>;
+declare function positive<T extends BigFloat | number>(error?: ErrorMessage): valibot.CustomValidation<T>;
 
-declare function precision<T extends BigFloat | number>(decimals: number, error?: ErrorMessage): (input: T) => PipeResult<T>;
+declare function precision<T extends BigFloat | number>(decimals: number, error?: ErrorMessage): valibot.CustomValidation<T>;
 
-declare function unique<T extends any[]>(compare?: (a: T[number], b: T[number]) => boolean, error?: ErrorMessage): (input: T) => PipeResult<T>;
+declare function unique<T extends any[]>(compare?: (a: T[number], b: T[number]) => boolean, error?: ErrorMessage): valibot.CustomValidation<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>;
+declare function minDuration<T extends Duration>(min: Duration, error?: ErrorMessage): valibot.CustomValidation<T>;
+declare function maxDuration<T extends Duration>(max: Duration, error?: ErrorMessage): valibot.CustomValidation<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

@@ -21,35 +21,23 @@ var json = (schema) => {
 import { BigFloat } from "@awsless/big-float";
 import {
   bigint,
-  getDefaultArgs,
+  defaultArgs,
   instance,
   number,
   object,
   string as string2,
   transform as transform2,
   union,
-  getPipeIssues,
-  getOutput
+  custom
 } from "valibot";
 var make = (value) => new BigFloat(value);
 function bigfloat(arg1, arg2) {
-  const [msg, pipe] = getDefaultArgs(arg1, arg2);
+  const [msg, pipe] = defaultArgs(arg1, arg2);
   const error = msg ?? "Invalid bigfloat";
   return union(
     [
       instance(BigFloat, pipe),
-      transform2(
-        string2([
-          (input) => {
-            if (input === "" || isNaN(Number(input))) {
-              return getPipeIssues("bigfloat", error, input);
-            }
-            return getOutput(input);
-          }
-        ]),
-        make,
-        pipe
-      ),
+      transform2(string2([custom((input) => input !== "" && !isNaN(Number(input)), error)]), make, pipe),
       transform2(number(), make, pipe),
       transform2(
         object({
@@ -65,9 +53,9 @@ function bigfloat(arg1, arg2) {
 }
 
 // src/schema/date.ts
-import { getDefaultArgs as getDefaultArgs2, date as base, string as string3, union as union2, transform as transform3 } from "valibot";
+import { defaultArgs as defaultArgs2, date as base, string as string3, union as union2, transform as transform3 } from "valibot";
 function date(arg1, arg2) {
-  const [error, pipe] = getDefaultArgs2(arg1, arg2);
+  const [error, pipe] = defaultArgs2(arg1, arg2);
   return union2(
     [
       base(pipe),
@@ -84,24 +72,24 @@ function date(arg1, arg2) {
 }
 
 // src/schema/uuid.ts
-import {
-  string as string4,
-  uuid as base2,
-  transform as transform4
-} from "valibot";
+import { string as string4, uuid as base2, transform as transform4 } from "valibot";
 var uuid = (error) => {
   return transform4(string4(error ?? "Invalid UUID", [base2()]), (v) => v);
 };
 
 // src/schema/duration.ts
-import { getDefaultArgs as getDefaultArgs3, regex, string as string5, transform as transform5 } from "valibot";
+import { defaultArgs as defaultArgs3, regex, string as string5, transform as transform5 } from "valibot";
 import { parse } from "@awsless/duration";
 function duration(arg1, arg2) {
-  const [msg, pipe] = getDefaultArgs3(arg1, arg2);
+  const [msg, pipe] = defaultArgs3(arg1, arg2);
   const error = msg ?? "Invalid duration";
   return transform5(
     string5(error, [regex(/^[0-9]+ (milliseconds?|seconds?|minutes?|hours?|days?)/, error)]),
-    (value) => parse(value),
+    (value, { issues }) => {
+      if (issues)
+        return;
+      return parse(value);
+    },
     pipe
   );
 }
@@ -159,7 +147,13 @@ var snsTopic = (body) => {
 };
 
 // src/schema/aws/dynamodb-stream.ts
-import { array as array3, object as object4, optional, picklist, transform as transform8, unknown as unknown3 } from "valibot";
+import { array as array3, object as object4, optional, enum_, transform as transform8, unknown as unknown3 } from "valibot";
+var EventName = /* @__PURE__ */ ((EventName2) => {
+  EventName2["modify"] = "MODIFY";
+  EventName2["insert"] = "INSERT";
+  EventName2["remove"] = "REMOVE";
+  return EventName2;
+})(EventName || {});
 var dynamoDbStream = (table) => {
   const marshall = () => transform8(unknown3(), (value) => table.unmarshall(value));
   return transform8(
@@ -167,7 +161,8 @@ var dynamoDbStream = (table) => {
       {
         Records: array3(
           object4({
-            eventName: picklist(["MODIFY", "INSERT", "REMOVE"]),
+            eventName: enum_(EventName),
+            // eventName: picklist(['MODIFY', 'INSERT', 'REMOVE']),
             dynamodb: object4({
               Keys: marshall(),
               OldImage: optional(marshall()),
@@ -194,45 +189,43 @@ var dynamoDbStream = (table) => {
 
 // src/validation/positive.ts
 import { ZERO, gt } from "@awsless/big-float";
-import { getOutput as getOutput2, getPipeIssues as getPipeIssues2 } from "valibot";
+import { custom as custom2 } from "valibot";
 function positive(error) {
-  return (input) => {
-    return gt(input, ZERO) ? getOutput2(input) : getPipeIssues2("positive", error ?? "Invalid positive number", input);
-  };
+  return custom2((input) => gt(input, ZERO), error ?? "Invalid positive number");
 }
 
 // src/validation/precision.ts
 import { BigFloat as BigFloat3 } from "@awsless/big-float";
-import { getOutput as getOutput3, getPipeIssues as getPipeIssues3 } from "valibot";
+import { custom as custom3 } from "valibot";
 function precision(decimals, error) {
-  return (input) => {
+  return custom3((input) => {
     const big = new BigFloat3(input.toString());
-    return -big.exponent <= decimals ? getOutput3(input) : getPipeIssues3("precision", error ?? `Invalid ${decimals} precision number`, input);
-  };
+    return -big.exponent <= decimals;
+  }, error ?? `Invalid ${decimals} precision number`);
 }
 
 // src/validation/unique.ts
-import { getOutput as getOutput4, getPipeIssues as getPipeIssues4 } from "valibot";
+import { custom as custom4 } from "valibot";
 function unique(compare = (a, b) => a === b, error) {
-  return (input) => {
+  return custom4((input) => {
     for (const x in input) {
       for (const y in input) {
         if (x !== y && compare(input[x], input[y])) {
-          return getPipeIssues4("unique", error ?? "None unique array", input);
+          return false;
         }
       }
     }
-    return getOutput4(input);
-  };
+    return true;
+  }, error ?? "None unique array");
 }
 
 // src/validation/duration.ts
-import { custom } from "valibot";
+import { custom as custom5 } from "valibot";
 function minDuration(min, error) {
-  return custom((input) => input.value >= min.value, error ?? "Invalid duration");
+  return custom5((input) => input.value >= min.value, error ?? "Invalid duration");
 }
 function maxDuration(max, error) {
-  return custom((input) => input.value <= max.value, error ?? "Invalid duration");
+  return custom5((input) => input.value <= max.value, error ?? "Invalid duration");
 }
 export {
   bigfloat,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/validate",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -25,16 +25,16 @@
   },
   "peerDependencies": {
     "@awsless/big-float": "^0.0.4",
-    "@awsless/dynamodb": "^0.0.40",
-    "@awsless/duration": "^0.0.1"
+    "@awsless/duration": "^0.0.1",
+    "@awsless/dynamodb": "^0.0.42"
   },
   "devDependencies": {
+    "@awsless/duration": "^0.0.1",
     "@awsless/big-float": "^0.0.4",
-    "@awsless/dynamodb": "^0.0.40",
-    "@awsless/duration": "^0.0.1"
+    "@awsless/dynamodb": "^0.0.42"
   },
   "dependencies": {
-    "valibot": "^0.20.1"
+    "valibot": "^0.28.1"
   },
   "scripts": {
     "test": "pnpm code test",