@better-giving/fundraiser 3.0.5 → 3.0.7

package/dist/cloudsearch.d.mts

@@ -1,6 +1,7 @@
 import type { ToDoc, ToHitFields, ToUpdate } from "@better-giving/types/cloudsearch";
-import type { FundInternal, NewFund } from "./schema.mjs";
-export interface CloudsearchFund extends Pick<NewFund, "name" | "description" | "logo" | "banner" | "featured" | "members" | "target">, Pick<FundInternal, "id" | "env" | "active" | "verified" | "donation_total_usd" | "creator_id" | "creator_name"> {
+import type { IFundInternal } from "./interfaces.mjs";
+import type { IFundNew } from "./schema.mjs";
+export interface CloudsearchFund extends Pick<IFundNew, "name" | "description" | "logo" | "banner" | "featured" | "members" | "target">, Pick<IFundInternal, "id" | "env" | "active" | "verified" | "donation_total_usd" | "creator_id" | "creator_name"> {
     /** iso | "9999-12-31T23:59:59Z" year 9999 */
     expiration: string;
 }

package/dist/db.d.mts

@@ -1,20 +1,38 @@
-import type { FundInternal, NewFund } from "./schema.mjs";
-export declare const fundGsi: {
-    readonly slugEnv: "slug-env-gsi";
-};
-export interface Keys {
-    /** Fund#${uuid} */
-    PK: `Fund#${string}`;
-    SK: `Fund#${string}`;
-}
-export interface Attributes extends NewFund, FundInternal {
-}
-export interface DbRecord extends Keys, Attributes {
-}
-export declare namespace SlugEnvGsi {
-    type Name = typeof fundGsi.slugEnv;
-    interface Keys extends Pick<Attributes, "slug" | "env"> {
-    }
-    interface Record extends DbRecord {
-    }
+import { Db, type TxType } from "@better-giving/db";
+import type { IFund } from "./interfaces.mjs";
+import type { IFundUpdate } from "./schema.mjs";
+export declare class FundDb extends Db {
+    static readonly table = "funds";
+    static readonly slug_env_gsi = "slug-env-gsi";
+    key_fund(id: string): {
+        PK: string;
+        SK: string;
+    };
+    fund_record(data: IFund): {
+        name: string;
+        description: string;
+        banner: string;
+        logo: string;
+        members: number[];
+        target: string;
+        videos: string[];
+        featured: boolean;
+        npo_owner: number;
+        expiration?: string | undefined;
+        slug?: string | undefined;
+        id: string;
+        env: import("@better-giving/schemas").Environment;
+        active: boolean;
+        verified: boolean;
+        donation_total_usd: number;
+        settings: import("./interfaces.mjs").IFundSettings;
+        creator_id: string;
+        creator_name: string;
+        PK: string;
+        SK: string;
+    };
+    fund_put_txi(data: IFund): TxType["Put"];
+    /**@param id - slug or uuid */
+    fund(id: string): Promise<IFund | undefined>;
+    fund_edit(id: string, { target, slug, ...update }: IFundUpdate): Promise<Record<string, any>>;
 }

package/dist/db.mjs

@@ -1,3 +1,68 @@
-export const fundGsi = {
-    slugEnv: "slug-env-gsi",
-};
+import { Db, UpdateBuilder } from "@better-giving/db";
+import { QueryCommand, UpdateCommand, } from "@aws-sdk/lib-dynamodb";
+import { UUID_REGEX } from "valibot";
+export class FundDb extends Db {
+    static table = "funds";
+    static slug_env_gsi = "slug-env-gsi";
+    key_fund(id) {
+        return {
+            PK: `Fund#${id}`,
+            SK: `Fund#${id}`,
+        };
+    }
+    fund_record(data) {
+        return {
+            ...this.key_fund(data.id),
+            ...data,
+        };
+    }
+    fund_put_txi(data) {
+        return {
+            TableName: FundDb.table,
+            Item: this.fund_record(data),
+        };
+    }
+    /**@param id - slug or uuid */
+    async fund(id) {
+        const q = {
+            TableName: FundDb.table,
+            Limit: 1,
+        };
+        if (UUID_REGEX.test(id)) {
+            q.KeyConditionExpression = "PK = :PK AND SK = :SK";
+            q.ExpressionAttributeValues = this.key_fund(id);
+        }
+        else {
+            q.IndexName = FundDb.slug_env_gsi;
+            q.KeyConditionExpression = "slug = :slug AND env = :env";
+            q.ExpressionAttributeValues = {
+                ":slug": id,
+                ":env": this.env,
+            };
+        }
+        const { Items: i = [] } = await this.client.send(new QueryCommand(q));
+        return i[0] && this.sans_keys(i[0]);
+    }
+    async fund_edit(id, { target, slug, ...update }) {
+        const updates = new UpdateBuilder();
+        if (slug)
+            updates.set("slug", slug);
+        if (slug === "")
+            updates.remove("slug");
+        if (target || target === "0") {
+            updates.set("target", target);
+        }
+        for (const [k, v] of Object.entries(update)) {
+            if (v === undefined)
+                continue;
+            updates.set(k, v);
+        }
+        const command = new UpdateCommand({
+            TableName: FundDb.table,
+            Key: this.key_fund(id),
+            ReturnValues: "ALL_NEW",
+            ...updates.collect(),
+        });
+        return this.client.send(command).then((res) => res.Attributes ?? {});
+    }
+}

package/dist/index.d.mts

@@ -1,17 +1,3 @@
-import type { IPageNumbered } from "@better-giving/types/api";
-import type { CloudsearchFund as FundItem } from "./cloudsearch.mjs";
-import type { FundInternal, NewFund } from "./schema.mjs";
-export type { Environment, FundSettings, FundUpdate, FundsEndowMemberOfParams, FundsParams, NewFund, } from "./schema.mjs";
-export type { FundItem };
-export interface FundMember {
-    id: number;
-    name: string;
-    logo: string | undefined;
-    banner: string | undefined;
-}
-export interface SingleFund extends Omit<NewFund, "members">, FundInternal {
-    members: FundMember[];
-}
-export interface FundsPage extends IPageNumbered<FundItem> {
-}
+export type { CloudsearchFund as FundItem } from "./cloudsearch.mjs";
+export type { IFundNew, IFundUpdate, IFundsNpoMemberOfSearchObj, IFundsSearchObj, DonateMethodId, Environment, } from "./schema.mjs";
 export declare const MAX_EXPIRATION = "9999-12-31T23:59:59Z";

package/dist/interfaces.d.mts

@@ -0,0 +1,28 @@
+import type { DonateMethodId, Environment } from "@better-giving/schemas";
+import type { IFundNew } from "./schema.mjs";
+import type { IPageNumbered } from "@better-giving/types/api";
+import type { CloudsearchFund } from "./cloudsearch.mjs";
+export interface IFundSettings {
+    hide_bg_tip: boolean;
+    donateMethods?: DonateMethodId[];
+}
+export interface IFundCreator {
+    /** "{number}" - endow id, "{email} - user*/
+    creator_id: string;
+    creator_name: string;
+}
+export interface IFundInternal extends IFundCreator {
+    /** uuid */
+    id: string;
+    env: Environment;
+    /** fund can be closed before expiration  */
+    active: boolean;
+    verified: boolean;
+    /** to date received: initialized to `0` */
+    donation_total_usd: number;
+    settings: IFundSettings;
+}
+export interface IFund extends IFundNew, IFundInternal {
+}
+export interface IFundsPage extends IPageNumbered<CloudsearchFund> {
+}

package/dist/interfaces.mjs

@@ -0,0 +1 @@
+export {};

package/dist/schema.d.mts

@@ -1,14 +1,13 @@
-import type { DonateMethodId } from "@better-giving/schemas";
-import type { Environment } from "@better-giving/types/list";
-export type { Environment } from "@better-giving/types/list";
 import { type InferOutput } from "valibot";
-export declare const fundId: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").UuidAction<string, undefined>]>;
+export { type DonateMethodId, slug } from "@better-giving/schemas";
+export type { Environment } from "@better-giving/types/list";
+export declare const fund_id: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").UuidAction<string, undefined>]>;
 /**
  * when fundraiser is created in the context of an NPO, all members of that NPO can edit the fundraiser
  * 0 - none
  */
 export declare const npo_owner: import("valibot").SchemaWithPipe<[import("valibot").NumberSchema<undefined>, import("valibot").IntegerAction<number, undefined>, import("valibot").MinValueAction<number, 0, undefined>]>;
-export declare const newFund: import("valibot").ObjectSchema<{
+export declare const fund_new: import("valibot").ObjectSchema<{
     readonly name: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").NonEmptyAction<string, "required">]>;
     readonly description: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").NonEmptyAction<string, "required">]>;
     readonly banner: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").UrlAction<string, undefined>]>;
@@ -23,7 +22,7 @@ export declare const newFund: import("valibot").ObjectSchema<{
     readonly npo_owner: import("valibot").SchemaWithPipe<[import("valibot").NumberSchema<undefined>, import("valibot").IntegerAction<number, undefined>, import("valibot").MinValueAction<number, 0, undefined>]>;
     readonly slug: import("valibot").OptionalSchema<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").MaxLengthAction<string, 30, ({ requirement: r }: import("valibot").MaxLengthIssue<string, 30>) => string>, import("valibot").RegexAction<string, "should not be an id">, import("valibot").RegexAction<string, "allowed: numbers | letters | - | . | _ | ~">, import("valibot").ExcludesAction<string, "..", "should not contain double periods">, import("valibot").CustomSchema<string, "should not start with dot">, import("valibot").CustomSchema<string, "should not end with dot">]>>, never>;
 }, undefined>;
-export declare const fundUpdate: Omit<Omit<import("valibot").ObjectSchema<{
+export declare const fund_update: Omit<Omit<import("valibot").ObjectSchema<{
     readonly name: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").NonEmptyAction<string, "required">]>;
     readonly description: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").NonEmptyAction<string, "required">]>;
     readonly banner: import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").UrlAction<string, undefined>]>;
@@ -131,38 +130,20 @@ export declare const fundUpdate: Omit<Omit<import("valibot").ObjectSchema<{
         readonly issue: import("valibot").StringIssue | import("valibot").NumberIssue | import("valibot").MinValueIssue<number, 0> | import("valibot").NonEmptyIssue<string> | import("valibot").UrlIssue<string> | import("valibot").ArrayIssue | import("valibot").BooleanIssue | import("valibot").LiteralIssue | import("valibot").UnionIssue<import("valibot").StringIssue | import("valibot").NumberIssue | import("valibot").MinValueIssue<number, 0> | import("valibot").LiteralIssue> | import("valibot").CustomIssue | import("valibot").MaxLengthIssue<string, 30> | import("valibot").RegexIssue<string> | import("valibot").ExcludesIssue<string, ".."> | import("valibot").ObjectIssue;
     } | undefined;
 };
-export declare const fundsParams: import("valibot").ObjectSchema<{
+export declare const funds_search: import("valibot").ObjectSchema<{
     /** search text */
     readonly query: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, never>;
     /** input str: from url */
-    readonly page: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").TransformAction<string, number>, import("valibot").NumberSchema<undefined>, import("valibot").IntegerAction<number, undefined>, import("valibot").MinValueAction<number, 1, undefined>]>, never>;
+    readonly page: 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>]>]>;
 }, undefined>;
-export declare const fundsEndowMemberOfParams: import("valibot").ObjectSchema<{
-    readonly npoProfileFeatured: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").TransformAction<string, boolean>, import("valibot").BooleanSchema<undefined>]>, never>;
+export declare const funds_npo_memberof_search: import("valibot").ObjectSchema<{
+    readonly npo_profile_featured: import("valibot").OptionalSchema<import("valibot").SchemaWithPipe<[import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").TrimAction]>, import("valibot").TransformAction<string, boolean>, import("valibot").BooleanSchema<undefined>]>, never>;
 }, undefined>;
-export interface NewFund extends InferOutput<typeof newFund> {
-}
-export interface FundUpdate extends InferOutput<typeof fundUpdate> {
-}
-export interface FundsParams extends InferOutput<typeof fundsParams> {
+export interface IFundNew extends InferOutput<typeof fund_new> {
 }
-export interface FundsEndowMemberOfParams extends InferOutput<typeof fundsEndowMemberOfParams> {
+export interface IFundUpdate extends InferOutput<typeof fund_update> {
 }
-export interface FundSettings {
-    hide_bg_tip: boolean;
-    donateMethods?: DonateMethodId[];
+export interface IFundsSearchObj extends InferOutput<typeof funds_search> {
 }
-export interface FundInternal {
-    /** uuid */
-    id: string;
-    env: Environment;
-    /** fund can be closed before expiration  */
-    active: boolean;
-    verified: boolean;
-    /** to date received: initialized to `0` */
-    donation_total_usd: number;
-    /** "{number}" - endow id, "{email} - user*/
-    creator_id: string;
-    creator_name: string;
-    settings: FundSettings;
+export interface IFundsNpoMemberOfSearchObj extends InferOutput<typeof funds_npo_memberof_search> {
 }

package/dist/schema.mjs

@@ -1,32 +1,32 @@
-import { slug } from "@better-giving/endowment/schema";
-import { url, array, boolean, integer, isoTimestamp, literal, maxLength, minValue, nonEmpty, number, object, optional, partial, pick, pipe, string, transform, trim, union, uuid, } from "valibot";
-const str = pipe(string(), trim());
-export const fundId = pipe(str, uuid());
+import { $, $int_gte1, slug } from "@better-giving/schemas";
+import { url, array, boolean, integer, isoTimestamp, literal, maxLength, minValue, nonEmpty, number, object, optional, partial, pick, pipe, string, transform, union, uuid, } from "valibot";
+export { slug } from "@better-giving/schemas";
+export const fund_id = pipe($, uuid());
 /**
  * when fundraiser is created in the context of an NPO, all members of that NPO can edit the fundraiser
  * 0 - none
  */
 export const npo_owner = pipe(number(), integer(), minValue(0));
-export const newFund = object({
-    name: pipe(str, nonEmpty("required")),
-    description: pipe(str, nonEmpty("required")),
-    banner: pipe(str, url()),
-    logo: pipe(str, url()),
+export const fund_new = object({
+    name: pipe($, nonEmpty("required")),
+    description: pipe($, nonEmpty("required")),
+    banner: pipe($, url()),
+    logo: pipe($, url()),
     /** endowment ids */
     members: pipe(array(pipe(number(), integer(), minValue(1))), nonEmpty(), maxLength(10)),
     featured: boolean(),
-    expiration: optional(pipe(str, isoTimestamp("invalid date"), minValue(new Date().toISOString()) //created each parsing
+    expiration: optional(pipe($, isoTimestamp("invalid date"), minValue(new Date().toISOString()) //created each parsing
     )),
     /** `"0"` - none, {"number"} = fixed */
     target: union([
         literal("smart"),
         pipe(string(), transform((v) => +v), number(), minValue(0), transform((v) => v.toString())),
     ]),
-    videos: array(pipe(str, url())),
+    videos: array(pipe($, url())),
     npo_owner,
     slug: optional(slug),
 });
-export const fundUpdate = partial(pick(newFund, [
+export const fund_update = partial(pick(fund_new, [
     "name",
     "description",
     "banner",
@@ -36,13 +36,13 @@ export const fundUpdate = partial(pick(newFund, [
     "videos",
     "slug",
 ]));
-export const fundsParams = object({
+export const funds_search = object({
     /** search text */
-    query: optional(str),
+    query: optional($),
     /** input str: from url */
-    page: optional(pipe(str, transform((x) => +x), number(), integer(), minValue(1))),
+    page: $int_gte1,
 });
-export const fundsEndowMemberOfParams = object({
+export const funds_npo_memberof_search = object({
     /*
      * this endow is the only member (not an index fund),
      * and is approved:
@@ -51,5 +51,5 @@ export const fundsEndowMemberOfParams = object({
      *
      * input str: from url
      */
-    npoProfileFeatured: optional(pipe(str, transform((x) => x === "true"), boolean())),
+    npo_profile_featured: optional(pipe($, transform((x) => x === "true"), boolean())),
 });

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@better-giving/fundraiser",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "peerDependencies": {
     "valibot": "0.42.0",
-    "@better-giving/endowment": "4.0.5",
     "@better-giving/schemas": "2.0.0",
-    "@better-giving/types": "1.1.8"
+    "@better-giving/types": "1.1.8",
+    "@better-giving/db": "2.0.1",
+    "@aws-sdk/lib-dynamodb": "3.485.0"
   },
   "devDependencies": {
     "@better-giving/config": "1.1.2"

package/src/cloudsearch.mts

@@ -3,11 +3,12 @@ import type {
   ToHitFields,
   ToUpdate,
 } from "@better-giving/types/cloudsearch";
-import type { FundInternal, NewFund } from "./schema.mjs";
+import type { IFundInternal } from "./interfaces.mjs";
+import type { IFundNew } from "./schema.mjs";
 
 export interface CloudsearchFund
   extends Pick<
-      NewFund,
+      IFundNew,
       | "name"
       | "description"
       | "logo"
@@ -17,7 +18,7 @@ export interface CloudsearchFund
       | "target"
     >,
     Pick<
-      FundInternal,
+      IFundInternal,
       | "id"
       | "env"
       | "active"

package/src/db.mts

@@ -1,20 +1,78 @@
-import type { FundInternal, NewFund } from "./schema.mjs";
+import { Db, UpdateBuilder, type TxType } from "@better-giving/db";
+import type { IFund } from "./interfaces.mjs";
+import {
+  QueryCommand,
+  UpdateCommand,
+  type QueryCommandInput,
+} from "@aws-sdk/lib-dynamodb";
+import { UUID_REGEX } from "valibot";
+import type { IFundUpdate } from "./schema.mjs";
 
-export const fundGsi = {
-  slugEnv: "slug-env-gsi",
-} as const;
+export class FundDb extends Db {
+  static readonly table = "funds";
+  static readonly slug_env_gsi = "slug-env-gsi";
+  key_fund(id: string) {
+    return {
+      PK: `Fund#${id}`,
+      SK: `Fund#${id}`,
+    };
+  }
+  fund_record(data: IFund) {
+    return {
+      ...this.key_fund(data.id),
+      ...data,
+    };
+  }
+  fund_put_txi(data: IFund): TxType["Put"] {
+    return {
+      TableName: FundDb.table,
+      Item: this.fund_record(data),
+    };
+  }
+  /**@param id - slug or uuid */
+  async fund(id: string): Promise<IFund | undefined> {
+    const q: QueryCommandInput = {
+      TableName: FundDb.table,
+      Limit: 1,
+    };
+    if (UUID_REGEX.test(id)) {
+      q.KeyConditionExpression = "PK = :PK AND SK = :SK";
+      q.ExpressionAttributeValues = this.key_fund(id);
+    } else {
+      q.IndexName = FundDb.slug_env_gsi;
+      q.KeyConditionExpression = "slug = :slug AND env = :env";
+      q.ExpressionAttributeValues = {
+        ":slug": id,
+        ":env": this.env,
+      };
+    }
 
-export interface Keys {
-  /** Fund#${uuid} */
-  PK: `Fund#${string}`;
-  SK: `Fund#${string}`;
-}
+    const { Items: i = [] } = await this.client.send(new QueryCommand(q));
+    return i[0] && this.sans_keys(i[0]);
+  }
+
+  async fund_edit(id: string, { target, slug, ...update }: IFundUpdate) {
+    const updates = new UpdateBuilder();
+
+    if (slug) updates.set("slug", slug);
+    if (slug === "") updates.remove("slug");
+
+    if (target || target === "0") {
+      updates.set("target", target);
+    }
+
+    for (const [k, v] of Object.entries(update)) {
+      if (v === undefined) continue;
+      updates.set(k, v);
+    }
 
-export interface Attributes extends NewFund, FundInternal {}
-export interface DbRecord extends Keys, Attributes {}
+    const command = new UpdateCommand({
+      TableName: FundDb.table,
+      Key: this.key_fund(id),
+      ReturnValues: "ALL_NEW",
+      ...updates.collect(),
+    });
 
-export namespace SlugEnvGsi {
-  export type Name = typeof fundGsi.slugEnv;
-  export interface Keys extends Pick<Attributes, "slug" | "env"> {}
-  export interface Record extends DbRecord {} //all attributes are copied to this index
+    return this.client.send(command).then((res) => res.Attributes ?? {});
+  }
 }

package/src/index.mts

@@ -1,27 +1,11 @@
-import type { IPageNumbered } from "@better-giving/types/api";
-import type { CloudsearchFund as FundItem } from "./cloudsearch.mjs";
-import type { FundInternal, NewFund } from "./schema.mjs";
+export type { CloudsearchFund as FundItem } from "./cloudsearch.mjs";
 export type {
+  IFundNew,
+  IFundUpdate,
+  IFundsNpoMemberOfSearchObj,
+  IFundsSearchObj,
+  DonateMethodId,
   Environment,
-  FundSettings,
-  FundUpdate,
-  FundsEndowMemberOfParams,
-  FundsParams,
-  NewFund,
 } from "./schema.mjs";
-export type { FundItem };
-
-export interface FundMember {
-  id: number;
-  name: string;
-  logo: string | undefined;
-  banner: string | undefined;
-}
-
-export interface SingleFund extends Omit<NewFund, "members">, FundInternal {
-  members: FundMember[];
-}
-
-export interface FundsPage extends IPageNumbered<FundItem> {}
 
 export const MAX_EXPIRATION = "9999-12-31T23:59:59Z";

package/src/interfaces.mts

@@ -0,0 +1,31 @@
+import type { DonateMethodId, Environment } from "@better-giving/schemas";
+import type { IFundNew } from "./schema.mjs";
+import type { IPageNumbered } from "@better-giving/types/api";
+import type { CloudsearchFund } from "./cloudsearch.mjs";
+
+export interface IFundSettings {
+  hide_bg_tip: boolean;
+  donateMethods?: DonateMethodId[];
+}
+
+export interface IFundCreator {
+  /** "{number}" - endow id, "{email} - user*/
+  creator_id: string;
+  creator_name: string;
+}
+
+export interface IFundInternal extends IFundCreator {
+  /** uuid */
+  id: string;
+  env: Environment;
+  /** fund can be closed before expiration  */
+  active: boolean;
+  verified: boolean;
+  /** to date received: initialized to `0` */
+  donation_total_usd: number;
+  settings: IFundSettings;
+}
+
+export interface IFund extends IFundNew, IFundInternal {}
+
+export interface IFundsPage extends IPageNumbered<CloudsearchFund> {}

package/src/schema.mts

@@ -1,7 +1,4 @@
-import { slug } from "@better-giving/endowment/schema";
-import type { DonateMethodId } from "@better-giving/schemas";
-import type { Environment } from "@better-giving/types/list";
-export type { Environment } from "@better-giving/types/list";
+import { $, $int_gte1, slug } from "@better-giving/schemas";
 import {
   url,
   type InferOutput,
@@ -21,25 +18,25 @@ import {
   pipe,
   string,
   transform,
-  trim,
   union,
   uuid,
 } from "valibot";
 
-const str = pipe(string(), trim());
+export { type DonateMethodId, slug } from "@better-giving/schemas";
+export type { Environment } from "@better-giving/types/list";
 
-export const fundId = pipe(str, uuid());
+export const fund_id = pipe($, uuid());
 /**
  * when fundraiser is created in the context of an NPO, all members of that NPO can edit the fundraiser
  * 0 - none
  */
 export const npo_owner = pipe(number(), integer(), minValue(0));
 
-export const newFund = object({
-  name: pipe(str, nonEmpty("required")),
-  description: pipe(str, nonEmpty("required")),
-  banner: pipe(str, url()),
-  logo: pipe(str, url()),
+export const fund_new = object({
+  name: pipe($, nonEmpty("required")),
+  description: pipe($, nonEmpty("required")),
+  banner: pipe($, url()),
+  logo: pipe($, url()),
   /** endowment ids */
   members: pipe(
     array(pipe(number(), integer(), minValue(1))),
@@ -49,7 +46,7 @@ export const newFund = object({
   featured: boolean(),
   expiration: optional(
     pipe(
-      str,
+      $,
       isoTimestamp("invalid date"),
       minValue(new Date().toISOString()) //created each parsing
     )
@@ -65,13 +62,13 @@ export const newFund = object({
       transform((v) => v.toString())
     ),
   ]),
-  videos: array(pipe(str, url())),
+  videos: array(pipe($, url())),
   npo_owner,
   slug: optional(slug),
 });
 
-export const fundUpdate = partial(
-  pick(newFund, [
+export const fund_update = partial(
+  pick(fund_new, [
     "name",
     "description",
     "banner",
@@ -83,22 +80,14 @@ export const fundUpdate = partial(
   ])
 );
 
-export const fundsParams = object({
+export const funds_search = object({
   /** search text */
-  query: optional(str),
+  query: optional($),
   /** input str: from url */
-  page: optional(
-    pipe(
-      str,
-      transform((x) => +x),
-      number(),
-      integer(),
-      minValue(1)
-    )
-  ),
+  page: $int_gte1,
 });
 
-export const fundsEndowMemberOfParams = object({
+export const funds_npo_memberof_search = object({
   /*
    * this endow is the only member (not an index fund),
    * and is approved:
@@ -107,37 +96,17 @@ export const fundsEndowMemberOfParams = object({
    *
    * input str: from url
    */
-  npoProfileFeatured: optional(
+  npo_profile_featured: optional(
     pipe(
-      str,
+      $,
       transform((x) => x === "true"),
       boolean()
     )
   ),
 });
 
-export interface NewFund extends InferOutput<typeof newFund> {}
-export interface FundUpdate extends InferOutput<typeof fundUpdate> {}
-export interface FundsParams extends InferOutput<typeof fundsParams> {}
-export interface FundsEndowMemberOfParams
-  extends InferOutput<typeof fundsEndowMemberOfParams> {}
-
-export interface FundSettings {
-  hide_bg_tip: boolean;
-  donateMethods?: DonateMethodId[];
-}
-
-export interface FundInternal {
-  /** uuid */
-  id: string;
-  env: Environment;
-  /** fund can be closed before expiration  */
-  active: boolean;
-  verified: boolean;
-  /** to date received: initialized to `0` */
-  donation_total_usd: number;
-  /** "{number}" - endow id, "{email} - user*/
-  creator_id: string;
-  creator_name: string;
-  settings: FundSettings;
-}
+export interface IFundNew extends InferOutput<typeof fund_new> {}
+export interface IFundUpdate extends InferOutput<typeof fund_update> {}
+export interface IFundsSearchObj extends InferOutput<typeof funds_search> {}
+export interface IFundsNpoMemberOfSearchObj
+  extends InferOutput<typeof funds_npo_memberof_search> {}