@better-giving/endowment 4.0.5 → 4.0.7

package/dist/cloudsearch.mjs

@@ -1,7 +1,7 @@
 import { $int_gte1, org_designation, unsdg_num } from "@better-giving/schemas";
 import { array, boolean, keyof, mapItems, number, object, optional, pick, pipe, } from "valibot";
-import { $, csvStrs, npo } from "./schema.mjs";
-const boolCsv = pipe(csvStrs, mapItems((x) => x === "true"), array(boolean()));
+import { $, csv_strs, npo } from "./schema.mjs";
+const boolCsv = pipe(csv_strs, mapItems((x) => x === "true"), array(boolean()));
 export const cloudsearchEndowFields = object({
     contributions_total: number(),
     contributions_count: number(),
@@ -31,11 +31,11 @@ export const cloudSearchEndowFields = keyof(cloudsearchEndow);
 export const endowsQueryParams = object({
     query: optional($),
     page: optional($int_gte1),
-    endow_designation: optional(pipe(csvStrs, array(org_designation))),
-    sdgs: optional(pipe(csvStrs, mapItems((x) => +x), array(unsdg_num))),
+    endow_designation: optional(pipe(csv_strs, array(org_designation))),
+    sdgs: optional(pipe(csv_strs, mapItems((x) => +x), array(unsdg_num))),
     kyc_only: optional(boolCsv),
     fund_opt_in: optional(boolCsv),
     claimed: optional(boolCsv),
-    countries: optional(pipe(csvStrs, array($))),
-    fields: optional(pipe(csvStrs, array(cloudSearchEndowFields))),
+    countries: optional(pipe(csv_strs, array($))),
+    fields: optional(pipe(csv_strs, array(cloudSearchEndowFields))),
 });

package/dist/schema.d.mts

@@ -1,9 +1,8 @@
-import { $, $int_gte1, $req, $req_num_gt0, donate_method_id, donate_method_ids, env, int_gte1, org_designation, slug, unsdg_num } from "@better-giving/schemas";
-export { org_designation as endow_designation, env, unsdg_num, donate_method_id, donate_method_ids, $int_gte1, int_gte1, $, $req_num_gt0, $req, slug, };
+export { $, $req, $req_num_gt0, donate_method_id, env, https_url, int_gte1, $int_gte1, org_designation, slug, unsdg_num, } from "@better-giving/schemas";
 import * as v from "valibot";
 export declare const min_payout_amount = 50;
 export declare const csv: v.LazySchema<v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]> | v.SchemaWithPipe<[v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, v.RegexAction<string, "invalid csv">]>>;
-export declare const csvStrs: v.SchemaWithPipe<[v.LazySchema<v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]> | v.SchemaWithPipe<[v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, v.RegexAction<string, "invalid csv">]>>, v.TransformAction<string, string[]>, v.FilterItemsAction<string[]>]>;
+export declare const csv_strs: v.SchemaWithPipe<[v.LazySchema<v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]> | v.SchemaWithPipe<[v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, v.RegexAction<string, "invalid csv">]>>, v.TransformAction<string, string[]>, v.FilterItemsAction<string[]>]>;
 export declare const allocation: v.SchemaWithPipe<[v.ObjectSchema<{
     readonly cash: v.SchemaWithPipe<[v.NumberSchema<undefined>, v.IntegerAction<number, undefined>, v.MinValueAction<number, 0, undefined>, v.MaxValueAction<number, 100, undefined>]>;
     readonly liq: v.SchemaWithPipe<[v.NumberSchema<undefined>, v.IntegerAction<number, undefined>, v.MinValueAction<number, 0, undefined>, v.MaxValueAction<number, 100, undefined>]>;
@@ -810,7 +809,7 @@ export declare const media_search: v.ObjectSchema<{
     readonly type: v.OptionalSchema<v.PicklistSchema<readonly ["album", "article", "video"], undefined>, never>;
     readonly next: v.OptionalSchema<v.SchemaWithPipe<[v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, v.Base64Action<string, undefined>]>, never>;
     readonly featured: v.OptionalSchema<v.SchemaWithPipe<[v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, v.TransformAction<string, boolean>, v.BooleanSchema<undefined>]>, never>;
-    readonly limit: v.OptionalSchema<v.SchemaWithPipe<[v.StringSchema<undefined>, v.TransformAction<string, number>, v.SchemaWithPipe<[v.NumberSchema<undefined>, v.IntegerAction<number, undefined>, v.MinValueAction<number, 1, undefined>]>]>, never>;
+    readonly limit: v.OptionalSchema<v.SchemaWithPipe<[v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, v.TransformAction<string, number>, v.SchemaWithPipe<[v.NumberSchema<undefined>, v.IntegerAction<number, undefined>, v.MinValueAction<number, 1, undefined>]>]>, never>;
 }, undefined>;
 export interface IMediaSearch extends v.InferInput<typeof media_search> {
 }

package/dist/schema.mjs

@@ -1,5 +1,5 @@
-import { $, $int_gte1, $req, $req_num_gt0, donate_method_id, donate_method_ids, env, https_url, int_gte1, org_designation, slug, unsdg_num, } from "@better-giving/schemas";
-export { org_designation as endow_designation, env, unsdg_num, donate_method_id, donate_method_ids, $int_gte1, int_gte1, $, $req_num_gt0, $req, slug, };
+import { $, $req, $req_num_gt0, donate_method_id, env, https_url, int_gte1, $int_gte1, org_designation, slug, unsdg_num, } from "@better-giving/schemas";
+export { $, $req, $req_num_gt0, donate_method_id, env, https_url, int_gte1, $int_gte1, org_designation, slug, unsdg_num, } from "@better-giving/schemas";
 import * as v from "valibot";
 export const min_payout_amount = 50;
 export const csv = v.lazy((x) => {
@@ -7,7 +7,7 @@ export const csv = v.lazy((x) => {
         return $;
     return v.pipe($, v.regex(/^[^,]+(?:,[^,]+)*$/, "invalid csv"));
 });
-export const csvStrs = v.pipe(csv, v.transform((x) => x.split(",")), v.filterItems((x) => x.length > 0));
+export const csv_strs = v.pipe(csv, v.transform((x) => x.split(",")), v.filterItems((x) => x.length > 0));
 const pct = v.pipe(v.number(), v.integer(), v.minValue(0), v.maxValue(100));
 export const allocation = v.pipe(v.object({
     cash: pct,
@@ -85,7 +85,7 @@ export const npo_update = v.partial(v.omit(npo, ["id", "claimed", "kyc_donors_on
 export const npo_fields = v.keyof(npo);
 /** for ein path, only fields in reg-num/env gsi is available */
 export const npo_search = v.object({
-    fields: v.optional(v.pipe(csvStrs, v.array(npo_fields))),
+    fields: v.optional(v.pipe(csv_strs, v.array(npo_fields))),
 });
 const amnt = v.pipe(v.number(), v.minValue(0));
 export const program_id = v.pipe($, v.uuid());
@@ -132,5 +132,5 @@ export const media_search = v.object({
     type: v.optional(media_type),
     next: v.optional(v.pipe($, v.base64())),
     featured: v.optional(v.pipe($, v.transform((x) => Boolean(x)), v.boolean())),
-    limit: v.optional(v.pipe(v.string(), v.transform((x) => +x), int_gte1)),
+    limit: v.optional($int_gte1),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-giving/endowment",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "dependencies": {
     "ksuid": "3.0.0"
   },

package/src/cloudsearch.mts

@@ -18,10 +18,10 @@ import {
   pick,
   pipe,
 } from "valibot";
-import { $, csvStrs, npo } from "./schema.mjs";
+import { $, csv_strs, npo } from "./schema.mjs";
 
 const boolCsv = pipe(
-  csvStrs,
+  csv_strs,
   mapItems((x) => x === "true"),
   array(boolean())
 );
@@ -58,10 +58,10 @@ export const cloudSearchEndowFields = keyof(cloudsearchEndow);
 export const endowsQueryParams = object({
   query: optional($),
   page: optional($int_gte1),
-  endow_designation: optional(pipe(csvStrs, array(org_designation))),
+  endow_designation: optional(pipe(csv_strs, array(org_designation))),
   sdgs: optional(
     pipe(
-      csvStrs,
+      csv_strs,
       mapItems((x) => +x),
       array(unsdg_num)
     )
@@ -69,8 +69,8 @@ export const endowsQueryParams = object({
   kyc_only: optional(boolCsv),
   fund_opt_in: optional(boolCsv),
   claimed: optional(boolCsv),
-  countries: optional(pipe(csvStrs, array($))),
-  fields: optional(pipe(csvStrs, array(cloudSearchEndowFields))),
+  countries: optional(pipe(csv_strs, array($))),
+  fields: optional(pipe(csv_strs, array(cloudSearchEndowFields))),
 });
 
 export interface CloudsearchEndowsQueryParamsObj

package/src/schema.mts

@@ -1,30 +1,29 @@
 import {
   $,
-  $int_gte1,
   $req,
   $req_num_gt0,
   donate_method_id,
-  donate_method_ids,
   env,
   https_url,
   int_gte1,
+  $int_gte1,
   org_designation,
   slug,
   unsdg_num,
 } from "@better-giving/schemas";
 export {
-  org_designation as endow_designation,
-  env,
-  unsdg_num,
-  donate_method_id,
-  donate_method_ids,
-  $int_gte1,
-  int_gte1,
   $,
-  $req_num_gt0,
   $req,
+  $req_num_gt0,
+  donate_method_id,
+  env,
+  https_url,
+  int_gte1,
+  $int_gte1,
+  org_designation,
   slug,
-};
+  unsdg_num,
+} from "@better-giving/schemas";
 import * as v from "valibot";
 
 export const min_payout_amount = 50;
@@ -33,7 +32,7 @@ export const csv = v.lazy((x) => {
   if (!x) return $;
   return v.pipe($, v.regex(/^[^,]+(?:,[^,]+)*$/, "invalid csv"));
 });
-export const csvStrs = v.pipe(
+export const csv_strs = v.pipe(
   csv,
   v.transform((x) => x.split(",")),
   v.filterItems((x) => x.length > 0)
@@ -165,7 +164,7 @@ export type INpoFields = v.InferOutput<typeof npo_fields>;
 
 /** for ein path, only fields in reg-num/env gsi is available */
 export const npo_search = v.object({
-  fields: v.optional(v.pipe(csvStrs, v.array(npo_fields))),
+  fields: v.optional(v.pipe(csv_strs, v.array(npo_fields))),
 });
 
 export interface INposSearch extends v.InferInput<typeof npo_search> {}
@@ -243,13 +242,7 @@ export const media_search = v.object({
       v.boolean()
     )
   ),
-  limit: v.optional(
-    v.pipe(
-      v.string(),
-      v.transform((x) => +x),
-      int_gte1
-    )
-  ),
+  limit: v.optional($int_gte1),
 });
 export interface IMediaSearch extends v.InferInput<typeof media_search> {}
 export interface IMediaSearchObj extends v.InferOutput<typeof media_search> {}