@drawbridge/drawbridge-utils 0.0.151 → 0.0.153

package/dist/providers.d.cts

@@ -1,4 +1,4 @@
-import { connections, mergeSettings } from './connections/index.cjs';
+import { vendors, mergeSettings, connections } from './connections/index.cjs';
 import { decrypt, encrypt } from './encrypt.cjs';
 import { slugify } from './slugify.cjs';
 import './connections/oauth.cjs';
@@ -58,27 +58,26 @@ import 'slugify';
 // `requires` and auth.oauth.client did not have to change when the storage
 // moved into the database.
 //
-// So the declaration lives on the manifest as `provider : { fields }`, build()
-// checks its shape at import, and this module is now only the reading, memoizing
-// and encrypting around it.
+// A manifest declares the fields it spends under `provider.vendors.<vendor>`,
+// connections/index.js merges every manifest's declarations into one entry per
+// vendor, and this module is only the reading, memoizing and encrypting around
+// that. The `provider` collection is keyed the same way: one row per vendor.
 //
-// Object.hasOwn, not `connections[ slug ] ||` — a bare property read walks the
-// prototype chain, and connections[ 'constructor' ] is a function whose .length
-// is 1, so the route's "does this vendor exist" guard passed for it and reached
-// the database before throwing.
+// Object.hasOwn, not `vendors[ slug ] ||` — a bare property read walks the
+// prototype chain, and vendors[ 'constructor' ] is a function whose .length is
+// 1, so the route's "does this vendor exist" guard passed for it and reached the
+// database before throwing.
 const providerFields = ( slug ) => (
-	Object.hasOwn( connections, slug ) ? ( connections[ slug ].provider?.fields || [] ) : []
+	Object.hasOwn( vendors, slug ) ? vendors[ slug ].fields : []
 );
 
 // The vendors an admin can configure, in a stable order.
 //
-// DERIVED FROM WHO DECLARES A PROVIDER BLOCK, not from the catalog: `webhook` is
-// a connection with no vendor behind it — nothing to authenticate against and
+// DERIVED FROM WHO DECLARES A VENDOR, not from the catalog: `webhook` is a
+// connection with no vendor behind it — nothing to authenticate against and
 // nothing to type — so it must not appear on a screen whose whole purpose is
 // entering credentials.
-const providerSlugs = () => Object.keys( connections )
-	.filter( ( slug ) => connections[ slug ].provider )
-	.sort();
+const providerSlugs = () => Object.keys( vendors ).sort();
 
 // LIVE IS DERIVED, never stored. A stored flag is a second thing to keep in
 // sync and goes stale the moment a row is edited by hand.
@@ -171,6 +170,29 @@ const providerSettings = async ({ controller, slug }) => {
 
 };
 
+// EVERYTHING A CONNECTION SPENDS, merged across the vendors its manifest
+// declares. `drawbridge` reads SendGrid, Twilio and HubSpot as one object, the
+// way it did when they sat on one row — the row split, the readers did not.
+//
+// Safe to merge because build() refuses a manifest whose vendors share a field
+// key. Each vendor read is memoized on its own, so three vendors are three Map
+// lookups inside the window.
+const vendorSettings = async ({ controller, slug }) => {
+
+	const declared = Object.hasOwn( connections, slug ) ? Object.keys( connections[ slug ].provider?.vendors || {} ) : [];
+
+	let merged = {};
+
+	for( const vendor of declared ){
+
+		merged = { ...merged, ...await providerSettings({ controller, slug : vendor }) };
+
+	}
+
+	return merged;
+
+};
+
 // Write a vendor's credentials.
 //
 // ONLY THE DECLARED FIELDS. The body arrives over the wire, so anything in it
@@ -325,4 +347,4 @@ const providerCredentials = async ({ controller }) => {
 
 };
 
-export { clearProviderMemo, isLive, mask, providerCredentials, providerEnvNames, providerFields, providerMemo, providerSettings, providerSlugs, saveProviderSettings };
+export { clearProviderMemo, isLive, mask, providerCredentials, providerEnvNames, providerFields, providerMemo, providerSettings, providerSlugs, saveProviderSettings, vendorSettings, vendors };

package/dist/providers.d.ts

@@ -1,4 +1,4 @@
-import { connections, mergeSettings } from './connections/index.js';
+import { vendors, mergeSettings, connections } from './connections/index.js';
 import { decrypt, encrypt } from './encrypt.js';
 import { slugify } from './slugify.js';
 import './connections/oauth.js';
@@ -58,27 +58,26 @@ import 'slugify';
 // `requires` and auth.oauth.client did not have to change when the storage
 // moved into the database.
 //
-// So the declaration lives on the manifest as `provider : { fields }`, build()
-// checks its shape at import, and this module is now only the reading, memoizing
-// and encrypting around it.
+// A manifest declares the fields it spends under `provider.vendors.<vendor>`,
+// connections/index.js merges every manifest's declarations into one entry per
+// vendor, and this module is only the reading, memoizing and encrypting around
+// that. The `provider` collection is keyed the same way: one row per vendor.
 //
-// Object.hasOwn, not `connections[ slug ] ||` — a bare property read walks the
-// prototype chain, and connections[ 'constructor' ] is a function whose .length
-// is 1, so the route's "does this vendor exist" guard passed for it and reached
-// the database before throwing.
+// Object.hasOwn, not `vendors[ slug ] ||` — a bare property read walks the
+// prototype chain, and vendors[ 'constructor' ] is a function whose .length is
+// 1, so the route's "does this vendor exist" guard passed for it and reached the
+// database before throwing.
 const providerFields = ( slug ) => (
-	Object.hasOwn( connections, slug ) ? ( connections[ slug ].provider?.fields || [] ) : []
+	Object.hasOwn( vendors, slug ) ? vendors[ slug ].fields : []
 );
 
 // The vendors an admin can configure, in a stable order.
 //
-// DERIVED FROM WHO DECLARES A PROVIDER BLOCK, not from the catalog: `webhook` is
-// a connection with no vendor behind it — nothing to authenticate against and
+// DERIVED FROM WHO DECLARES A VENDOR, not from the catalog: `webhook` is a
+// connection with no vendor behind it — nothing to authenticate against and
 // nothing to type — so it must not appear on a screen whose whole purpose is
 // entering credentials.
-const providerSlugs = () => Object.keys( connections )
-	.filter( ( slug ) => connections[ slug ].provider )
-	.sort();
+const providerSlugs = () => Object.keys( vendors ).sort();
 
 // LIVE IS DERIVED, never stored. A stored flag is a second thing to keep in
 // sync and goes stale the moment a row is edited by hand.
@@ -171,6 +170,29 @@ const providerSettings = async ({ controller, slug }) => {
 
 };
 
+// EVERYTHING A CONNECTION SPENDS, merged across the vendors its manifest
+// declares. `drawbridge` reads SendGrid, Twilio and HubSpot as one object, the
+// way it did when they sat on one row — the row split, the readers did not.
+//
+// Safe to merge because build() refuses a manifest whose vendors share a field
+// key. Each vendor read is memoized on its own, so three vendors are three Map
+// lookups inside the window.
+const vendorSettings = async ({ controller, slug }) => {
+
+	const declared = Object.hasOwn( connections, slug ) ? Object.keys( connections[ slug ].provider?.vendors || {} ) : [];
+
+	let merged = {};
+
+	for( const vendor of declared ){
+
+		merged = { ...merged, ...await providerSettings({ controller, slug : vendor }) };
+
+	}
+
+	return merged;
+
+};
+
 // Write a vendor's credentials.
 //
 // ONLY THE DECLARED FIELDS. The body arrives over the wire, so anything in it
@@ -325,4 +347,4 @@ const providerCredentials = async ({ controller }) => {
 
 };
 
-export { clearProviderMemo, isLive, mask, providerCredentials, providerEnvNames, providerFields, providerMemo, providerSettings, providerSlugs, saveProviderSettings };
+export { clearProviderMemo, isLive, mask, providerCredentials, providerEnvNames, providerFields, providerMemo, providerSettings, providerSlugs, saveProviderSettings, vendorSettings, vendors };