@better-giving/schemas 1.1.3 → 1.2.1

package/dist/index.d.mts

@@ -1,20 +1,28 @@
 import { type InferOutput } from "valibot";
-export declare const fileObject: import("valibot").ObjectSchema<{
+export declare const file_obj: import("valibot").ObjectSchema<{
     readonly name: import("valibot").StringSchema<undefined>;
     readonly publicUrl: import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").UrlAction<string, undefined>]>;
 }, undefined>;
-export declare const orgDesignations: readonly ["Charity", "Religious Organization", "University", "Hospital", "Other"];
-export declare const orgDesignation: import("valibot").PicklistSchema<readonly ["Charity", "Religious Organization", "University", "Hospital", "Other"], undefined>;
-export type OrgDesignation = InferOutput<typeof orgDesignation>;
-export interface FileObject extends InferOutput<typeof fileObject> {
+export declare const org_designations: readonly ["Charity", "Religious Organization", "University", "Hospital", "Other"];
+export declare const org_designation: import("valibot").PicklistSchema<readonly ["Charity", "Religious Organization", "University", "Hospital", "Other"], undefined>;
+export type OrgDesignation = InferOutput<typeof org_designation>;
+export interface FileObject extends InferOutput<typeof file_obj> {
 }
-export declare const unSdgNums: readonly [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17];
-export declare const unSdgNum: import("valibot").PicklistSchema<readonly [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17], undefined>;
-export type UnSdgNum = InferOutput<typeof unSdgNum>;
+export declare const unsdg_nums: readonly [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17];
+export declare const unsdg_num: import("valibot").PicklistSchema<readonly [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17], undefined>;
+export type UnSdgNum = InferOutput<typeof unsdg_num>;
 export declare const envs: readonly ["staging", "production"];
 export declare const env: import("valibot").PicklistSchema<readonly ["staging", "production"], undefined>;
 export type Environment = InferOutput<typeof env>;
-export declare const donateMethodIds: readonly ["stripe", "crypto", "daf", "stocks"];
-export declare const donateMethodId: import("valibot").PicklistSchema<readonly ["stripe", "crypto", "daf", "stocks"], undefined>;
-export type DonateMethodId = InferOutput<typeof donateMethodId>;
+export declare const donate_method_ids: readonly ["stripe", "crypto", "daf", "stocks"];
+export declare const donate_method_id: import("valibot").PicklistSchema<readonly ["stripe", "crypto", "daf", "stocks"], undefined>;
+export type DonateMethodId = InferOutput<typeof donate_method_id>;
+export declare const $: import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>;
+export declare const $req: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").NonEmptyAction<string, "required">]>;
+export declare const int_gte1: import("valibot").SchemaWithPipe<[import("valibot").NumberSchema<undefined>, import("valibot").IntegerAction<number, undefined>, import("valibot").MinValueAction<number, 1, undefined>]>;
+export declare const $int_gte1: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").TransformAction<string, number>, import("valibot").SchemaWithPipe<[import("valibot").NumberSchema<undefined>, import("valibot").IntegerAction<number, undefined>, import("valibot").MinValueAction<number, 1, undefined>]>]>;
+export declare const $req_num_gt0: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").NonEmptyAction<string, "required">]>, import("valibot").TransformAction<string, number>, import("valibot").NumberSchema<"invalid number">, import("valibot").MinValueAction<number, 0, "must be > 0">, import("valibot").TransformAction<number, string>]>;
+export declare const $num_gt0_fn: ({ required, }?: {
+    required?: boolean;
+}) => import("valibot").LazySchema<import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]> | import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").NonEmptyAction<string, "required">]> | import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").NonEmptyAction<string, "required">]>, import("valibot").TransformAction<string, number>, import("valibot").NumberSchema<"invalid number">, import("valibot").MinValueAction<number, 0, "must be > 0">, import("valibot").TransformAction<number, string>]>>;
 export declare const https_url: (non_empty: boolean) => import("valibot").LazySchema<import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]> | import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").NonEmptyAction<string, "required">]> | import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").TransformAction<string, string>, import("valibot").UrlAction<string, "invalid url">]>>;

package/dist/index.mjs

@@ -1,27 +1,42 @@
-import { url, object, picklist, pipe, string, lazy, transform, trim, nonEmpty, } from "valibot";
-export const fileObject = object({
+import { url, lazy, nonEmpty, object, picklist, pipe, string, transform, trim, number, minValue, integer, } from "valibot";
+export const file_obj = object({
     name: string(),
     publicUrl: pipe(string(), url()),
 });
-export const orgDesignations = [
+export const org_designations = [
     "Charity",
     "Religious Organization",
     "University",
     "Hospital",
     "Other",
 ];
-export const orgDesignation = picklist(orgDesignations);
-export const unSdgNums = [
+export const org_designation = picklist(org_designations);
+export const unsdg_nums = [
     1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
 ];
-export const unSdgNum = picklist(unSdgNums);
+export const unsdg_num = picklist(unsdg_nums);
 export const envs = ["staging", "production"];
 export const env = picklist(envs);
-export const donateMethodIds = ["stripe", "crypto", "daf", "stocks"];
-export const donateMethodId = picklist(donateMethodIds);
-const str = pipe(string(), trim());
-export const https_url = (non_empty) => lazy((x) => {
-    if (!x)
-        return non_empty ? pipe(str, nonEmpty("required")) : str;
-    return pipe(str, transform((x) => (x.startsWith("https://") ? x : `https://${x}`)), url("invalid url"));
-});
+export const donate_method_ids = ["stripe", "crypto", "daf", "stocks"];
+export const donate_method_id = picklist(donate_method_ids);
+export const $ = pipe(string(), trim());
+export const $req = pipe($, nonEmpty("required"));
+export const int_gte1 = pipe(number(), integer(), minValue(1));
+export const $int_gte1 = pipe($, transform((x) => +x), int_gte1);
+export const $req_num_gt0 = pipe($req, transform((x) => +x), number("invalid number"), minValue(0, "must be > 0"), transform((x) => x.toString()));
+export const $num_gt0_fn = ({ required = false, } = {}) => {
+    return lazy((x) => {
+        if (!x && required)
+            return $req;
+        if (!x)
+            return $;
+        return $req_num_gt0;
+    });
+};
+export const https_url = (non_empty) => {
+    return lazy((x) => {
+        if (!x)
+            return non_empty ? $req : $;
+        return pipe($, transform((x) => (x.startsWith("https://") ? x : `https://${x}`)), url("invalid url"));
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-giving/schemas",
-  "version": "1.1.3",
+  "version": "1.2.1",
   "devDependencies": {
     "@better-giving/config": "1.1.2"
   },

package/src/index.mts

@@ -1,22 +1,25 @@
 import {
   url,
   type InferOutput,
+  lazy,
+  nonEmpty,
   object,
   picklist,
   pipe,
   string,
-  lazy,
   transform,
   trim,
-  nonEmpty,
+  number,
+  minValue,
+  integer,
 } from "valibot";
 
-export const fileObject = object({
+export const file_obj = object({
   name: string(),
   publicUrl: pipe(string(), url()),
 });
 
-export const orgDesignations = [
+export const org_designations = [
   "Charity",
   "Religious Organization",
   "University",
@@ -24,33 +27,61 @@ export const orgDesignations = [
   "Other",
 ] as const;
 
-export const orgDesignation = picklist(orgDesignations);
-export type OrgDesignation = InferOutput<typeof orgDesignation>;
+export const org_designation = picklist(org_designations);
+export type OrgDesignation = InferOutput<typeof org_designation>;
 
-export interface FileObject extends InferOutput<typeof fileObject> {}
+export interface FileObject extends InferOutput<typeof file_obj> {}
 
-export const unSdgNums = [
+export const unsdg_nums = [
   1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
 ] as const;
 
-export const unSdgNum = picklist(unSdgNums);
-export type UnSdgNum = InferOutput<typeof unSdgNum>;
+export const unsdg_num = picklist(unsdg_nums);
+export type UnSdgNum = InferOutput<typeof unsdg_num>;
 
 export const envs = ["staging", "production"] as const;
 export const env = picklist(envs);
 export type Environment = InferOutput<typeof env>;
 
-export const donateMethodIds = ["stripe", "crypto", "daf", "stocks"] as const;
-export const donateMethodId = picklist(donateMethodIds);
-export type DonateMethodId = InferOutput<typeof donateMethodId>;
+export const donate_method_ids = ["stripe", "crypto", "daf", "stocks"] as const;
+export const donate_method_id = picklist(donate_method_ids);
+export type DonateMethodId = InferOutput<typeof donate_method_id>;
+
+export const $ = pipe(string(), trim());
+export const $req = pipe($, nonEmpty("required"));
+
+export const int_gte1 = pipe(number(), integer(), minValue(1));
+export const $int_gte1 = pipe(
+  $,
+  transform((x) => +x),
+  int_gte1
+);
+
+export const $req_num_gt0 = pipe(
+  $req,
+  transform((x) => +x),
+  number("invalid number"),
+  minValue(0, "must be > 0"),
+  transform((x) => x.toString())
+);
+
+export const $num_gt0_fn = ({
+  required = false,
+}: { required?: boolean } = {}) => {
+  return lazy((x) => {
+    if (!x && required) return $req;
+    if (!x) return $;
+    return $req_num_gt0;
+  });
+};
 
-const str = pipe(string(), trim());
-export const https_url = (non_empty: boolean) =>
-  lazy((x) => {
-    if (!x) return non_empty ? pipe(str, nonEmpty("required")) : str;
+export const https_url = (non_empty: boolean) => {
+  return lazy((x) => {
+    if (!x) return non_empty ? $req : $;
     return pipe(
-      str,
+      $,
       transform((x) => (x.startsWith("https://") ? x : `https://${x}`)),
       url("invalid url")
     );
   });
+};