@better-giving/endowment 4.0.24 → 4.0.26

package/dist/schema.mjs

@@ -134,3 +134,38 @@ export const media_search = v.object({
     featured: v.optional(v.pipe($, v.transform((x) => Boolean(x)), v.boolean())),
     limit: v.optional($int_gte1),
 });
+export const bool_csv = v.pipe(csv_strs, v.mapItems((x) => x === "true"), v.array(v.boolean()));
+export const npo_item = v.object({
+    ...v.pick(npo, [
+        "card_img",
+        "name",
+        "tagline",
+        "hq_country",
+        "sdgs",
+        "active_in_countries",
+        "endow_designation",
+        "registration_number",
+        "kyc_donors_only",
+        "claimed",
+        //filters
+        "env",
+        "id",
+        "published",
+        "fund_opt_in",
+        "target",
+    ]).entries,
+    contributions_total: v.number(),
+    contributions_count: v.number(),
+});
+export const npo_item_fields = v.keyof(npo_item);
+export const npos_search = v.object({
+    query: v.optional($),
+    page: v.optional($int_gte1),
+    endow_designation: v.optional(v.pipe(csv_strs, v.array(org_designation))),
+    sdgs: v.optional(v.pipe(csv_strs, v.mapItems((x) => +x), v.array(unsdg_num))),
+    kyc_only: v.optional(bool_csv),
+    fund_opt_in: v.optional(bool_csv),
+    claimed: v.optional(bool_csv),
+    countries: v.optional(v.pipe(csv_strs, v.array($))),
+    fields: v.optional(v.pipe(csv_strs, v.array(npo_item_fields))),
+});

package/package.json

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

package/src/db.mts

@@ -9,9 +9,9 @@ import {
 } from "@aws-sdk/lib-dynamodb";
 import {
   Db,
+  type TxType,
   Txs,
   UpdateBuilder,
-  type TxType,
   type UpdateComps,
 } from "@better-giving/db";
 import KSUID from "ksuid";
@@ -379,10 +379,7 @@ export class NpoDb extends Db {
     });
     return this.client.send(cmd);
   }
-  async npo_update_txi(
-    id: number,
-    update: INpoUpdate
-  ): Promise<TxType["Update"]> {
+  npo_update_txi(id: number, update: INpoUpdate): TxType["Update"] {
     const upd8 = this.npo_update_comps(update);
     return {
       TableName: NpoDb.table,

package/src/index.mts

@@ -1,7 +1,24 @@
-export * from "./interfaces.mjs";
+export type * from "./interfaces.mjs";
 export { NpoDb } from "./db.mjs";
 export type {
-  CloudsearchEndow as EndowItem,
-  CloudsearchEndowsQueryParams as EndowsQueryParams,
-  CloudsearchEndowsQueryParamsParsed as EndowsQueryParamsParsed,
-} from "./cloudsearch.mjs";
+  IAllocation,
+  IIncrement,
+  IMediaSearch,
+  IMediaSearchObj,
+  IMediaUpdate,
+  IMilestone,
+  IMilestoneNew,
+  IMilestoneUpdate,
+  INpo,
+  INpoFields,
+  INpoItem,
+  INpoUpdate,
+  IProgram,
+  IProgramDb,
+  IProgramNew,
+  IProgramUpdate,
+  ISocialMediaURLs,
+  TMediaType,
+  INposSearch,
+  INposSearchObj,
+} from "./schema.mjs";

package/src/interfaces.mts

@@ -1,27 +1,6 @@
 import type { IPageKeyed } from "@better-giving/types/api";
 import type { Ensure } from "@better-giving/types/utils";
-import type { CloudsearchEndow } from "./cloudsearch.mjs";
-import type { IMediaUpdate, INpo, TMediaType } from "./schema.mjs";
-export type {
-  IAllocation,
-  INpo,
-  INpoFields,
-  INposSearch,
-  INpoUpdate,
-  IIncrement,
-  IMediaSearch,
-  IMediaSearchObj,
-  TMediaType,
-  IMediaUpdate,
-  IMilestone,
-  IMilestoneUpdate,
-  IMilestoneNew,
-  IProgram,
-  IProgramDb,
-  IProgramNew,
-  IProgramUpdate,
-  ISocialMediaURLs,
-} from "./schema.mjs";
+import type { IMediaUpdate, INpo, INpoItem, TMediaType } from "./schema.mjs";
 
 export {
   type OrgDesignation as EndowDesignation,
@@ -72,10 +51,8 @@ export type TNpoDbProjectedTo<T> = T extends TNpoDbKeys[]
 /** 0 - true, 1 - false, 0 is lexicographically first  */
 export type TBinFlag = "0" | "1";
 
-export interface INposPage<
-  T extends keyof CloudsearchEndow = keyof CloudsearchEndow,
-> {
-  items: Pick<CloudsearchEndow, T>[];
+export interface INposPage<T extends keyof INpoItem = keyof INpoItem> {
+  items: Pick<INpoItem, T>[];
   page: number;
   pages: number;
 }

package/src/schema.mts

@@ -246,3 +246,57 @@ export const media_search = v.object({
 });
 export interface IMediaSearch extends v.InferInput<typeof media_search> {}
 export interface IMediaSearchObj extends v.InferOutput<typeof media_search> {}
+
+export const bool_csv = v.pipe(
+  csv_strs,
+  v.mapItems((x) => x === "true"),
+  v.array(v.boolean())
+);
+
+export const npo_item = v.object({
+  ...v.pick(npo, [
+    "card_img",
+    "name",
+    "tagline",
+    "hq_country",
+    "sdgs",
+    "active_in_countries",
+    "endow_designation",
+    "registration_number",
+    "kyc_donors_only",
+    "claimed",
+    //filters
+    "env",
+    "id",
+    "published",
+    "fund_opt_in",
+    "target",
+  ]).entries,
+  contributions_total: v.number(),
+  contributions_count: v.number(),
+});
+
+export interface INpoItem extends v.InferOutput<typeof npo_item> {}
+
+export const npo_item_fields = v.keyof(npo_item);
+
+export const npos_search = v.object({
+  query: v.optional($),
+  page: v.optional($int_gte1),
+  endow_designation: v.optional(v.pipe(csv_strs, v.array(org_designation))),
+  sdgs: v.optional(
+    v.pipe(
+      csv_strs,
+      v.mapItems((x) => +x),
+      v.array(unsdg_num)
+    )
+  ),
+  kyc_only: v.optional(bool_csv),
+  fund_opt_in: v.optional(bool_csv),
+  claimed: v.optional(bool_csv),
+  countries: v.optional(v.pipe(csv_strs, v.array($))),
+  fields: v.optional(v.pipe(csv_strs, v.array(npo_item_fields))),
+});
+
+export interface INposSearch extends v.InferInput<typeof npos_search> {}
+export interface INposSearchObj extends v.InferOutput<typeof npos_search> {}

package/src/cloudsearch.mts

@@ -1,98 +0,0 @@
-import { $int_gte1, org_designation, unsdg_num } from "@better-giving/schemas";
-import type {
-  ToDoc,
-  ToHitFields,
-  ToUpdate,
-} from "@better-giving/types/cloudsearch";
-import type { Environment } from "@better-giving/types/list";
-import {
-  type InferInput,
-  type InferOutput,
-  array,
-  boolean,
-  keyof,
-  mapItems,
-  number,
-  object,
-  optional,
-  pick,
-  pipe,
-} from "valibot";
-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(),
-});
-
-export const cloudsearchEndow = object({
-  ...pick(npo, [
-    "card_img",
-    "name",
-    "tagline",
-    "hq_country",
-    "sdgs",
-    "active_in_countries",
-    "endow_designation",
-    "registration_number",
-    "kyc_donors_only",
-    "claimed",
-    //filters
-    "env",
-    "id",
-    "published",
-    "fund_opt_in",
-    "target",
-  ]).entries,
-  ...cloudsearchEndowFields.entries,
-});
-
-export const cloudSearchEndowFields = keyof(cloudsearchEndow);
-
-export const endowsQueryParams = object({
-  query: optional($),
-  page: optional($int_gte1),
-  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(csv_strs, array($))),
-  fields: optional(pipe(csv_strs, array(cloudSearchEndowFields))),
-});
-
-export interface CloudsearchEndowsQueryParamsObj
-  extends InferInput<typeof endowsQueryParams> {}
-
-export interface CloudsearchEndowsQueryParams
-  extends InferInput<typeof endowsQueryParams> {}
-
-export interface CloudsearchEndowsQueryParamsParsed
-  extends InferOutput<typeof endowsQueryParams> {}
-
-export interface CloudsearchEndow
-  extends InferOutput<typeof cloudsearchEndow> {}
-
-export type DocId = `${Environment}-${number}`;
-
-interface Doc extends ToDoc<CloudsearchEndow> {
-  documentId: DocId;
-  _score: number;
-}
-
-export interface HitFields
-  extends ToHitFields<Omit<Doc, "documentId" | "_score">> {}
-
-export type Update = ToUpdate<DocId, CloudsearchEndow>;