@adhese/sdk 0.10.0 → 0.11.0

package/dist/index.d.ts

@@ -448,24 +448,21 @@ type SlotManagerOptions = {
 
 type AdRequestOptions = {
     /**
-     * List of slots you want to fetch the ad for
+     * Slot you want to fetch the ad for
      */
-    slots: ReadonlyArray<{
+    slot: {
         name: MaybeRef<string>;
         parameters: Map<string, ReadonlyArray<string> | string>;
-    }>;
+    };
     context: AdheseContext;
 };
-/**
- * Request multiple ads at once from the API
- */
-declare function requestAds(requestOptions: AdRequestOptions): Promise<ReadonlyArray<Ad>>;
+type AdMultiRequestOptions = Omit<AdRequestOptions, 'slot'> & {
+    slots: ReadonlyArray<AdRequestOptions['slot']>;
+};
 /**
  * Request a single ad from the API. If you need to fetch multiple ads at once use the `requestAds` function.
  */
-declare function requestAd({ slot, ...options }: Omit<AdRequestOptions, 'slots'> & {
-    slot: AdRequestOptions['slots'][number];
-}): Promise<Ad>;
+declare function requestAd(options: AdRequestOptions): Promise<Ad>;
 
 /**
  * A log entry saved by the logger
@@ -538,7 +535,7 @@ declare const onDispose: (callback: (arg: void) => void | Promise<void>) => () =
 
 declare const onRender: (callback: (arg: Ad) => void | Ad | Promise<void | Ad>) => () => void;
 
-declare const onRequest: (callback: (arg: AdRequestOptions) => void | AdRequestOptions | Promise<void | AdRequestOptions>) => () => void;
+declare const onRequest: (callback: (arg: AdMultiRequestOptions) => void | AdMultiRequestOptions | Promise<void | AdMultiRequestOptions>) => () => void;
 
 declare const onResponse: (callback: (arg: readonly Ad[]) => void | readonly Ad[] | Promise<void | readonly Ad[]>) => () => void;
 
@@ -688,7 +685,7 @@ type AdheseEvents = {
     removeSlot: AdheseSlot;
     changeSlots: ReadonlyArray<AdheseSlot>;
     responseReceived: ReadonlyArray<Ad>;
-    requestAd: AdRequestOptions;
+    requestAd: AdMultiRequestOptions;
     requestError: Error;
     previewReceived: ReadonlyArray<Ad>;
     parametersChange: Map<string, ReadonlyArray<string> | string>;
@@ -762,6 +759,7 @@ type AdheseContext = Partial<Pick<Adhese, 'events' | 'getAll' | 'get' | 'paramet
     logger: typeof logger;
     debug: boolean;
     safeFrame?: SafeFrame;
+    isDisposed: boolean;
 };
 
 /**
@@ -788,4 +786,4 @@ type AdheseContext = Partial<Pick<Adhese, 'events' | 'getAll' | 'get' | 'paramet
  */
 declare function createAdhese(options: AdheseOptions): Readonly<Adhese>;
 
-export { type Ad, type AdRequestOptions, type Adhese, type AdheseContext, type AdheseOptions, type AdhesePlugin, type AdhesePluginInformation, type AdheseSlot, type AdheseSlotOptions, type SlotManager, createAdhese, logger, requestAd, requestAds };
+export { type Ad, type AdRequestOptions, type Adhese, type AdheseContext, type AdheseOptions, type AdhesePlugin, type AdhesePluginInformation, type AdheseSlot, type AdheseSlotOptions, type SlotManager, createAdhese, logger, requestAd };

package/dist/index.js

@@ -123,7 +123,7 @@ function createSafeFrame({
 }
 const name = "@adhese/sdk";
 const type = "module";
-const version = "0.10.0";
+const version = "0.11.0";
 const description = "Adhese SDK";
 const license = "GPL-3.0";
 const repository = {
@@ -155,7 +155,7 @@ const scripts = {
 const dependencies = {
   "@vue/runtime-core": "^3.4.21",
   remeda: "^1.61.0",
-  zod: "^3.23.0"
+  zod: "^3.23.4"
 };
 const packageJson = {
   name,
@@ -650,6 +650,36 @@ function filterSpecialChars(value) {
   const specialRegex = /[^\p{L}\p{N}_]/gu;
   return value.replaceAll(specialRegex, "_");
 }
+const batch = /* @__PURE__ */ new Map();
+const debouncedRequestAds = debounce(async (context) => {
+  if (batch.size === 0)
+    return [];
+  const ads = await requestAds({
+    slots: Array.from(batch.values()).map(({ options }) => options.slot),
+    context
+  });
+  for (const { options, resolve, reject } of batch.values()) {
+    const ad = ads.find(({ slotName }) => toValue(slotName) === toValue(options.slot.name));
+    if (ad)
+      resolve(ad);
+    else
+      reject(new Error(`Ad: ${toValue(options.slot.name)} not found`));
+  }
+  batch.clear();
+  return ads;
+}, {
+  waitMs: 20,
+  timing: "trailing"
+});
+async function requestAd(options) {
+  const promise = new Promise(
+    (resolve, reject) => {
+      batch.set(toValue(options.slot.name), { options, resolve, reject });
+    }
+  );
+  await debouncedRequestAds.call(options.context);
+  return promise;
+}
 async function requestAds(requestOptions) {
   var _a, _b, _c, _d, _e;
   const options = await runOnRequest(requestOptions);
@@ -690,16 +720,6 @@ async function requestAds(requestOptions) {
     throw error;
   }
 }
-async function requestAd({
-  slot,
-  ...options
-}) {
-  const [ad] = await requestAds({
-    slots: [slot],
-    ...options
-  });
-  return ad;
-}
 const [runOnRender, onRender] = createAsyncHook("onRender");
 const [runOnSlotCreate, onSlotCreate] = createSyncHook("onSlotCreate");
 const [runOnViewabilityChanged, onViewabilityChanged] = createPassiveHook("onViewabilityChanged");
@@ -1000,6 +1020,10 @@ function createSlotManager({
         onDispose: onDispose2,
         context
       });
+      if (slots.has(slot.name.value)) {
+        slot.dispose();
+        throw new Error(`Slot with the name: ${slot.name.value} already exists. Create a new slot with a different format, slot, or the location.`);
+      }
       function onDispose2() {
         var _a2;
         slots.delete(slot.name.value);
@@ -1125,11 +1149,9 @@ function createAdhese(options) {
       location: mergedOptions.location,
       consent: mergedOptions.consent,
       debug: mergedOptions.debug,
-      getAll,
-      get,
       options: mergedOptions,
       logger,
-      addSlot
+      isDisposed: false
     });
     for (const [index, plugin] of mergedOptions.plugins.entries()) {
       plugin(context, {
@@ -1202,22 +1224,25 @@ function createAdhese(options) {
     function getAll() {
       return slotManager.getAll() ?? [];
     }
+    context.getAll = getAll;
     function get(name2) {
       return slotManager.get(name2);
     }
+    context.get = get;
     function addSlot(slotOptions) {
       const newSlot = slotManager.add(slotOptions);
       debouncedFetchAllUnrenderedSlots.call().catch(logger.error);
       return newSlot;
     }
+    context.addSlot = addSlot;
     async function findDomSlots2() {
       const domSlots = (await slotManager.findDomSlots() ?? []).filter((slot) => !slot.lazyLoading);
       if (domSlots.length <= 0)
         return [];
-      const ads = await requestAds({
-        slots: domSlots,
+      const ads = await Promise.all(domSlots.map((slot) => requestAd({
+        slot,
         context
-      });
+      })));
       for (const ad of ads) {
         const slot = slotManager.get(ad.slotName);
         if (slot)
@@ -1243,10 +1268,10 @@ function createAdhese(options) {
       const slots = (slotManager.getAll() ?? []).filter((slot) => !slot.lazyLoading && !slot.ad.value);
       if (slots.length === 0)
         return;
-      const ads = await requestAds({
-        slots,
+      const ads = await Promise.all(slots.map((slot) => requestAd({
+        slot,
         context
-      });
+      })));
       for (const ad of ads) {
         const slot = slotManager.get(ad.slotName);
         if (slot)
@@ -1266,6 +1291,7 @@ function createAdhese(options) {
     });
     function dispose() {
       var _a, _b;
+      context.isDisposed = true;
       queryDetector.dispose();
       slotManager.dispose();
       queryDetector.dispose();
@@ -1311,7 +1337,6 @@ function createAdhese(options) {
 export {
   createAdhese,
   logger,
-  requestAd,
-  requestAds
+  requestAd
 };
 //# sourceMappingURL=index.js.map