@better-giving/donation 1.1.14 → 1.1.16

package/dist/donation.d.mts

@@ -196,6 +196,7 @@ export declare namespace Donation {
             title?: DonorTitle;
             firstName: string;
             lastName: string;
+            companyName?: string;
             email: string;
             address?: DonorAddress;
             /** signifies eligibility to UK Gift Aid, defaults to `false` for crypto donations */

package/dist/intent.d.mts

@@ -21,6 +21,7 @@ export type DonorAddress = v.InferOutput<typeof donorAddress>;
 export declare const donor: v.ObjectSchema<{
     readonly title: v.PicklistSchema<readonly ["Mr", "Mrs", "Ms", "Mx", ""], undefined>;
     readonly firstName: v.SchemaWithPipe<[v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, v.NonEmptyAction<string, undefined>]>;
+    readonly companyName: v.OptionalSchema<v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, never>;
     readonly lastName: v.SchemaWithPipe<[v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, v.NonEmptyAction<string, undefined>]>;
     readonly email: v.SchemaWithPipe<[v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, v.EmailAction<string, undefined>]>;
     readonly address: v.OptionalSchema<v.ObjectSchema<{
@@ -80,6 +81,7 @@ export declare const intent: v.ObjectSchema<{
     readonly donor: v.ObjectSchema<{
         readonly title: v.PicklistSchema<readonly ["Mr", "Mrs", "Ms", "Mx", ""], undefined>;
         readonly firstName: v.SchemaWithPipe<[v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, v.NonEmptyAction<string, undefined>]>;
+        readonly companyName: v.OptionalSchema<v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, never>;
         readonly lastName: v.SchemaWithPipe<[v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, v.NonEmptyAction<string, undefined>]>;
         readonly email: v.SchemaWithPipe<[v.SchemaWithPipe<[v.StringSchema<undefined>, v.TrimAction]>, v.EmailAction<string, undefined>]>;
         readonly address: v.OptionalSchema<v.ObjectSchema<{

package/dist/intent.mjs

@@ -23,6 +23,7 @@ export const donorAddress = v.object({
 export const donor = v.object({
     title: donorTitle,
     firstName: requiredStr,
+    companyName: v.optional(str),
     lastName: requiredStr,
     email: v.pipe(str, v.email()),
     address: v.optional(donorAddress),

package/dist/old-intent.mjs

@@ -41,7 +41,7 @@ export const oldIntent = v.pipe(v.object({
 }), v.transform((input) => ({
     amount: {
         amount: input.amount,
-        currency: input.currency ? input.currency : input.denomination ?? "",
+        currency: input.currency ? input.currency : (input.denomination ?? ""),
         tip: input.tipAmount,
         feeAllowance: input.feeAllowance,
     },
@@ -83,7 +83,7 @@ export const oldIntent = v.pipe(v.object({
         : undefined,
     frequency: (input.type === "subscription"
         ? "recurring"
-        : input.type ?? "one-time"),
+        : (input.type ?? "one-time")),
     viaName: input.chainName ?? "fiat",
-    viaId: input.chainId ? input.chainId : input.transactionId ?? "fiat",
+    viaId: input.chainId ? input.chainId : (input.transactionId ?? "fiat"),
 })));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-giving/donation",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "devDependencies": {
     "@better-giving/config": "1.1.2"
   },

package/src/donation.mts

@@ -292,6 +292,7 @@ export declare namespace Donation {
       title?: DonorTitle;
       firstName: string;
       lastName: string;
+      companyName?: string;
       email: string;
       address?: DonorAddress;
       /** signifies eligibility to UK Gift Aid, defaults to `false` for crypto donations */

package/src/intent.mts

@@ -37,6 +37,7 @@ export type DonorAddress = v.InferOutput<typeof donorAddress>;
 export const donor = v.object({
   title: donorTitle,
   firstName: requiredStr,
+  companyName: v.optional(str),
   lastName: requiredStr,
   email: v.pipe(str, v.email()),
   address: v.optional(donorAddress),

package/src/final-recorder.mts

@@ -1,54 +0,0 @@
-import type { Donation } from "./donation.mjs";
-
-type FinalRecord = Pick<
-  Donation.V2DBRecord,
-  | "amount"
-  | "appUsed"
-  | "chainName"
-  | "charityName"
-  | "claimed"
-  | "denomination"
-  | "email"
-  | "endowmentId"
-  | "feeAllowance"
-  | "fiatRamp"
-  | "fiscalSponsored"
-  | "inHonorOf"
-  | "isRecurring"
-  | "network"
-  | "nonProfitMsg"
-  | "paymentMethod"
-  | "programId"
-  | "programName"
-  | "splitLiq"
-  | "tipAmount"
-  | "transactionDate"
-  | "transactionId"
-  | "tributeNotif"
-  | "usdValue"
->;
-
-interface SettledAmounts {
-  settledFee: number;
-  settledNet: number;
-}
-
-/** donation is to fund */
-interface Fund {
-  fund_id?: string;
-  fund_name?: string;
-  fund_members?: number[];
-}
-
-export type FinalRecorderPayload = {
-  /** intent to delete */
-  intentId?: string;
-  hideBgTip: boolean;
-
-  /** donation message */
-  donor_message?: string;
-  donor_public?: boolean;
-} & FinalRecord &
-  SettledAmounts &
-  Fund &
-  (Donation.WithKYC | Donation.WithoutKYC);

package/src/get-min-fee-allowance.mts

@@ -1,20 +0,0 @@
-/**
- * @param amount endow amount + tip
- * @param rate 0-1, to be applied to amount @example `amount * rate`
- * @param flat flat amount added to `amount * rate`. NOTE: make sure that this is in the same unit as `amount`
- * @returns number
- */
-export const getMinFeeAllowance = (
-  amount: number,
-  rate: number,
-  flat = 0
-): number => {
-  /**
-   * fee(1) = amount * rate + flat
-   * fee(2) = (amount + fee(1)) * rate + flat
-   * fee(3) = (amount + fee(2)) * rate + flat
-   * i.e. F₍ₙ₎ = a · ∑ᵏ⁼¹ⁿ (rᵏ) + f · ∑ᵏ⁼⁰ⁿ⁻¹ (rᵏ)
-   * which converges to this formula: n approaches infinity
-   */
-  return (amount * rate + flat) / (1 - rate);
-};

package/src/old-intent.mts

@@ -1,104 +0,0 @@
-import * as v from "valibot";
-import {
-  type Frequency,
-  donationSource,
-  donorTitle,
-  tributeNotif,
-  uuid,
-} from "./intent.mjs";
-
-const str = v.pipe(v.string(), v.trim());
-const requiredStr = v.pipe(str, v.nonEmpty());
-
-const int = v.pipe(v.number(), v.integer());
-const money = v.pipe(v.number(), v.minValue(0));
-
-const donorAddress = v.object({
-  streetAddress: requiredStr,
-  city: str,
-  state: str,
-  zipCode: requiredStr,
-  /** country name */
-  country: requiredStr,
-});
-
-const donor = v.object({
-  title: donorTitle,
-  firstName: requiredStr,
-  lastName: requiredStr,
-  email: v.pipe(str, v.email()),
-  address: v.optional(donorAddress),
-  ukGiftAid: v.optional(v.boolean()),
-});
-
-export const oldIntent = v.pipe(
-  v.object({
-    transactionId: v.optional(str),
-    type: v.optional(v.picklist(["one-time", "subscription"])),
-    amount: money,
-    tipAmount: money,
-    feeAllowance: money,
-    currency: v.optional(str),
-    endowmentId: v.pipe(int, v.minValue(1)),
-    programId: v.optional(uuid),
-    programName: v.optional(str),
-    splitLiq: v.pipe(int, v.minValue(0), v.maxValue(100)),
-    donor,
-    inHonorOf: v.optional(str),
-    tributeNotif: v.optional(tributeNotif),
-    source: donationSource,
-    denomination: v.optional(str),
-    chainId: v.optional(str),
-    chainName: v.optional(str),
-  }),
-  v.transform((input) => ({
-    amount: {
-      amount: input.amount,
-      currency: input.currency ? input.currency : input.denomination ?? "",
-      tip: input.tipAmount,
-      feeAllowance: input.feeAllowance,
-    },
-    recipient: input.endowmentId,
-    program:
-      input.programId && input.programName
-        ? {
-            id: input.programId,
-            name: input.programName,
-          }
-        : undefined,
-    donor: {
-      title: input.donor.title,
-      firstName: input.donor.firstName,
-      lastName: input.donor.lastName,
-      email: input.donor.email,
-      address: input.donor.address
-        ? {
-            street: input.donor.address.streetAddress,
-            city: input.donor.address.city,
-            state: input.donor.address.state,
-            zipCode: input.donor.address.zipCode,
-            country: input.donor.address.country,
-            ukGiftAid: input.donor.ukGiftAid,
-          }
-        : undefined,
-    },
-    source: input.source,
-    tribute: input.inHonorOf
-      ? {
-          fullName: input.inHonorOf,
-          notif: input.tributeNotif
-            ? {
-                toEmail: input.tributeNotif.toEmail,
-                toFullName: input.tributeNotif.toFullName,
-                fromMsg: input.tributeNotif.fromMsg,
-              }
-            : undefined,
-        }
-      : undefined,
-    frequency: (input.type === "subscription"
-      ? "recurring"
-      : input.type ?? "one-time") as Frequency,
-    viaName: input.chainName ?? "fiat",
-    viaId: input.chainId ? input.chainId : input.transactionId ?? "fiat",
-  }))
-);