@better-giving/endowment 4.0.30 → 4.0.31

package/dist/db.mjs

@@ -3,7 +3,8 @@ import { BatchGetCommand, DeleteCommand, GetCommand, PutCommand, QueryCommand, T
 import { Db, Txs, UpdateBuilder, } from "@better-giving/db";
 import KSUID from "ksuid";
 import { med_key_filter, med_sk, to_imedia } from "./media.mjs";
-import { projection } from "./npo.mjs";
+import { npo_fields } from "./npo.mjs";
+import { projection } from "@better-giving/db/helpers";
 export class NpoDb extends Db {
     static table = "endowments_v3";
     static slug_env_gsi = "slug-env-gsi";
@@ -56,7 +57,7 @@ export class NpoDb extends Db {
             gsi1SK: med_sk(id, type, featured),
         };
     }
-    async npos_get(ids, fields) {
+    async npos_get(ids, fields = Object.keys(npo_fields)) {
         if (ids.length === 0)
             return [];
         const { names, expression } = projection(fields);
@@ -227,7 +228,7 @@ export class NpoDb extends Db {
         });
         return this.client.send(cmd);
     }
-    async npo(id, fields) {
+    async npo(id, fields = Object.keys(npo_fields)) {
         const { names, expression } = projection(fields);
         if (typeof id === "string") {
             const cmd = new QueryCommand({

package/dist/npo.d.mts

@@ -1,4 +1,4 @@
-export declare function projection(fields?: string[]): {
-    expression: string;
-    names: Record<string, string>;
+import type { INpo } from "./schema.mjs";
+export declare const npo_fields: {
+    [K in keyof Required<INpo>]: "";
 };

package/dist/npo.mjs

@@ -1,4 +1,4 @@
-const npo_fields = {
+export const npo_fields = {
     id: "",
     active_in_countries: "",
     endow_designation: "",
@@ -34,8 +34,3 @@ const npo_fields = {
     w_form: "",
     payout_minimum: "",
 };
-export function projection(fields = Object.keys(npo_fields)) {
-    const expression = fields.map((n) => `#${n}`).join(",");
-    const names = fields.reduce((prev, curr) => ({ ...prev, [`#${curr}`]: curr }), {});
-    return { expression, names };
-}

package/dist/schema.mjs

@@ -1,4 +1,4 @@
-import { $, $int_gte1, $req, donate_method_id, env, https_url, increment, int_gte1, MAX_NUM_INCREMENTS, target, org_designation, slug, unsdg_num, } from "@better-giving/schemas";
+import { $, $int_gte1, $req, MAX_NUM_INCREMENTS, donate_method_id, env, https_url, increment, int_gte1, org_designation, slug, target, 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;

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@better-giving/endowment",
-  "version": "4.0.30",
+  "version": "4.0.31",
   "dependencies": {
     "ksuid": "3.0.0"
   },
   "peerDependencies": {
+    "@better-giving/schemas": "2.0.4",
     "@better-giving/types": "1.1.8",
-    "@better-giving/db": "2.0.6",
+    "@better-giving/db": "2.0.7",
     "@aws-sdk/lib-dynamodb": "3.485.0",
-    "valibot": "0.42.0",
-    "@better-giving/schemas": "2.0.4"
+    "valibot": "0.42.0"
   },
   "devDependencies": {
     "@better-giving/config": "1.1.2"

package/src/db.mts

@@ -28,7 +28,6 @@ import type {
   TNpoDbProjectedTo,
 } from "./interfaces.mjs";
 import { med_key_filter, med_sk, to_imedia } from "./media.mjs";
-import { projection } from "./npo.mjs";
 import type {
   IMediaSearchObj,
   IMediaUpdate,
@@ -43,6 +42,8 @@ import type {
   IProgramUpdate,
   TMediaType,
 } from "./schema.mjs";
+import { npo_fields } from "./npo.mjs";
+import { projection } from "@better-giving/db/helpers";
 
 export class NpoDb extends Db {
   static readonly table = "endowments_v3";
@@ -104,7 +105,7 @@ export class NpoDb extends Db {
 
   async npos_get<T extends TNpoDbKeys[]>(
     ids: number[],
-    fields?: T
+    fields: T = Object.keys(npo_fields) as T
   ): Promise<TNpoDbProjectedTo<T>[]> {
     if (ids.length === 0) return [];
     const { names, expression } = projection(fields);
@@ -307,7 +308,7 @@ export class NpoDb extends Db {
 
   async npo<T extends TNpoDbKeys[]>(
     id: string | number,
-    fields?: T
+    fields: T = Object.keys(npo_fields) as T
   ): Promise<TNpoDbProjectedTo<T> | undefined> {
     const { names, expression } = projection(fields);
 

package/src/npo.mts

@@ -1,6 +1,6 @@
 import type { INpo } from "./schema.mjs";
 
-const npo_fields: { [K in keyof Required<INpo>]: "" } = {
+export const npo_fields: { [K in keyof Required<INpo>]: "" } = {
   id: "",
   active_in_countries: "",
   endow_designation: "",
@@ -36,12 +36,3 @@ const npo_fields: { [K in keyof Required<INpo>]: "" } = {
   w_form: "",
   payout_minimum: "",
 };
-
-export function projection(fields: string[] = Object.keys(npo_fields)) {
-  const expression = fields.map((n) => `#${n}`).join(",");
-  const names = fields.reduce(
-    (prev, curr) => ({ ...prev, [`#${curr}`]: curr }),
-    {} as Record<string, string>
-  );
-  return { expression, names };
-}

package/src/schema.mts

@@ -2,15 +2,15 @@ import {
   $,
   $int_gte1,
   $req,
+  MAX_NUM_INCREMENTS,
   donate_method_id,
   env,
   https_url,
   increment,
   int_gte1,
-  MAX_NUM_INCREMENTS,
-  target,
   org_designation,
   slug,
+  target,
   unsdg_num,
 } from "@better-giving/schemas";
 export {