@better-giving/endowment 3.0.5 → 4.0.1

package/dist/db.d.mts

@@ -1,4 +1,4 @@
-import { Db } from "@better-giving/db";
+import { Db, type UpdateComps } from "@better-giving/db";
 import type { IMedia, IMediaPage, INpoReferredBy, INpoWithRegNum, INpoWithRid, TBinFlag, TNpoDbKeys, TNpoDbProjectedTo } from "./interfaces.mjs";
 import type { IMediaSearchObj, IMilestone, IMilestoneUpdate, INpo, INpoUpdate, IProgram, IProgramDb, IProgramNew, IProgramUpdate, TMediaType } from "./schema.mjs";
 export declare class NpoDb extends Db {
@@ -132,7 +132,8 @@ export declare class NpoDb extends Db {
     npo_med(npo: number, mid: string): Promise<IMedia | undefined>;
     npo_med_delete(npo: number, mid: string): Promise<import("@aws-sdk/lib-dynamodb").DeleteCommandOutput>;
     npo<T extends TNpoDbKeys[]>(id: string | number, fields?: T): Promise<TNpoDbProjectedTo<T> | undefined>;
-    npo_update(id: number, { target, slug, social_media_urls, ...update }: INpoUpdate): Promise<import("@aws-sdk/lib-dynamodb").UpdateCommandOutput>;
+    npo_update_comps({ target, slug, social_media_urls, ...update }: INpoUpdate): Promise<UpdateComps>;
+    npo_update(id: number, update: INpoUpdate): Promise<import("@aws-sdk/lib-dynamodb").UpdateCommandOutput>;
     prog_milestones(id: string): Promise<IMilestone[]>;
     prog_milestone_delete(pid: string, mid: string): Promise<import("@aws-sdk/lib-dynamodb").DeleteCommandOutput>;
     prog_milestone_update(pid: string, mid: string, update: IMilestoneUpdate): Promise<Record<string, any> | undefined>;

package/dist/db.mjs

@@ -222,7 +222,7 @@ export class NpoDb extends Db {
         const { Item: i } = await this.client.send(cmd);
         return i ? this.sans_keys(i) : undefined;
     }
-    async npo_update(id, { target, slug, social_media_urls, ...update }) {
+    async npo_update_comps({ target, slug, social_media_urls, ...update }) {
         const updates = new UpdateBuilder();
         if (slug)
             updates.set("slug", slug);
@@ -243,11 +243,15 @@ export class NpoDb extends Db {
                 continue;
             updates.set(k, v);
         }
+        return updates.collect();
+    }
+    async npo_update(id, update) {
+        const upd8 = this.npo_update_comps(update);
         const cmd = new UpdateCommand({
             TableName: NpoDb.name,
             Key: this.key_npo(id),
+            ...upd8,
             ReturnValues: "ALL_NEW",
-            ...updates.collect(),
         });
         return this.client.send(cmd);
     }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@better-giving/endowment",
-  "version": "3.0.5",
+  "version": "4.0.1",
   "dependencies": {
     "ksuid": "3.0.0"
   },
   "peerDependencies": {
-    "@better-giving/schemas": "1.2.3",
+    "@better-giving/schemas": "2.0.0",
     "@better-giving/types": "1.1.8",
-    "@better-giving/db": "1.0.12",
+    "@better-giving/db": "2.0.0",
     "@aws-sdk/lib-dynamodb": "3.485.0",
     "valibot": "0.42.0"
   },

package/src/db.mts

@@ -6,7 +6,7 @@ import {
   TransactWriteCommand,
   UpdateCommand,
 } from "@aws-sdk/lib-dynamodb";
-import { Db, Txs, UpdateBuilder } from "@better-giving/db";
+import { Db, Txs, UpdateBuilder, type UpdateComps } from "@better-giving/db";
 import KSUID from "ksuid";
 import type {
   IMedia,
@@ -288,10 +288,12 @@ export class NpoDb extends Db {
     return i ? this.sans_keys(i) : undefined;
   }
 
-  async npo_update(
-    id: number,
-    { target, slug, social_media_urls, ...update }: INpoUpdate
-  ) {
+  async npo_update_comps({
+    target,
+    slug,
+    social_media_urls,
+    ...update
+  }: INpoUpdate): Promise<UpdateComps> {
     const updates = new UpdateBuilder();
 
     if (slug) updates.set("slug", slug);
@@ -313,13 +315,17 @@ export class NpoDb extends Db {
       updates.set(k, v);
     }
 
+    return updates.collect();
+  }
+
+  async npo_update(id: number, update: INpoUpdate) {
+    const upd8 = this.npo_update_comps(update);
     const cmd = new UpdateCommand({
       TableName: NpoDb.name,
       Key: this.key_npo(id),
+      ...upd8,
       ReturnValues: "ALL_NEW",
-      ...updates.collect(),
     });
-
     return this.client.send(cmd);
   }