@aglyn/plugins-marketing 1.0.0-beta.182 → 1.0.0-beta.184

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aglyn/plugins-marketing",
-  "version": "1.0.0-beta.182",
+  "version": "1.0.0-beta.184",
   "license": "Apache-2.0",
   "homepage": "https://aglyn.com",
   "repository": {
@@ -25,20 +25,20 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@aglyn/aglyn": "1.0.0-beta.182",
-    "@aglyn/shared-data-enums": "1.0.0-beta.182",
-    "@aglyn/shared-data-mdi": "1.0.0-beta.182",
-    "@aglyn/shared-ui-email-campaigns": "1.0.0-beta.182",
-    "@aglyn/shared-ui-jsx": "1.0.0-beta.182",
-    "@aglyn/shared-ui-jsx-forms": "1.0.0-beta.182",
-    "@aglyn/shared-ui-next": "1.0.0-beta.182",
-    "@aglyn/shared-ui-snackstack": "1.0.0-beta.182",
-    "@aglyn/shared-util-email": "1.0.0-beta.182",
-    "@aglyn/shared-util-http": "1.0.0-beta.182",
-    "@aglyn/shared-util-timestamp": "1.0.0-beta.182",
-    "@aglyn/tenant-data-admin": "1.0.0-beta.182",
-    "@aglyn/tenant-feature-instance": "1.0.0-beta.182",
-    "@aglyn/tenant-runtime": "1.0.0-beta.182",
+    "@aglyn/aglyn": "1.0.0-beta.184",
+    "@aglyn/shared-data-enums": "1.0.0-beta.184",
+    "@aglyn/shared-data-mdi": "1.0.0-beta.184",
+    "@aglyn/shared-ui-email-campaigns": "1.0.0-beta.184",
+    "@aglyn/shared-ui-jsx": "1.0.0-beta.184",
+    "@aglyn/shared-ui-jsx-forms": "1.0.0-beta.184",
+    "@aglyn/shared-ui-next": "1.0.0-beta.184",
+    "@aglyn/shared-ui-snackstack": "1.0.0-beta.184",
+    "@aglyn/shared-util-email": "1.0.0-beta.184",
+    "@aglyn/shared-util-http": "1.0.0-beta.184",
+    "@aglyn/shared-util-timestamp": "1.0.0-beta.184",
+    "@aglyn/tenant-data-admin": "1.0.0-beta.184",
+    "@aglyn/tenant-feature-instance": "1.0.0-beta.184",
+    "@aglyn/tenant-runtime": "1.0.0-beta.184",
     "@swc/helpers": "0.5.23"
   },
   "peerDependencies": {

package/src/lib/server/campaign-send.js

@@ -16,6 +16,7 @@ import { _ as _extends } from "@swc/helpers/_/_extends";
  * limitations under the License.
  */ import { checkQuota, contactMatchesSegment, isEmailTopicId, DEFAULT_CAMPAIGN_TOPIC_ID, readMarketingBasis, resolveMarketingConsentPolicy, splitByMarketingConsent, createResourceUid, decodeStoredNodes, emailStarterSendBlock, resolveBrandingProfile, visibleToHost } from "@aglyn/aglyn/server";
 import { renderRecipientEmail } from "@aglyn/aglyn/app-utils/recipient-email-render";
+import { composeHostComponentNodes } from "@aglyn/aglyn/app-utils/load-referenced-components";
 import { assignExperimentVariant } from "../model/index.js";
 import { campaignPlacedOnHost } from "@aglyn/shared-ui-email-campaigns/model";
 import { readPluginRecordCard } from "@aglyn/aglyn/plugin-manager/plugin-record-cards";
@@ -195,6 +196,11 @@ const EMAIL_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 /**
  * Loads a designed email template's nodes + referenced products for the
  * render pipeline. Throws 400 when the screen isn't an email document.
+ *
+ * The nodes come back COMPOSED: every reusable block the design places — a
+ * shared header, a footer — expanded into the blocks it stands for (AGL-3287).
+ * Everything downstream renders from this one map: each recipient's copy, the
+ * test send and the composer's preview.
  */ async function loadEmailTemplate(hostId, screenId) {
     var _decodeStoredNodes, _ref, _screenSnapshot_get, _screenSnapshot_get1;
     const firestore = firebaseAdmin.app().firestore();
@@ -225,8 +231,8 @@ const EMAIL_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
    * blocks missing — discovered by the recipients. Decoding first is also what
    * makes the guard mean something: `decodeStoredNodes` returns null for an
    * undecodable payload, so the send is refused instead of mailed empty.
-   */ const nodes = (_decodeStoredNodes = decodeStoredNodes(versionSnapshot == null ? void 0 : versionSnapshot.get('nodes'))) != null ? _decodeStoredNodes : {};
-    if (!Object.keys(nodes).length) {
+   */ const stored = (_decodeStoredNodes = decodeStoredNodes(versionSnapshot == null ? void 0 : versionSnapshot.get('nodes'))) != null ? _decodeStoredNodes : {};
+    if (!Object.keys(stored).length) {
         throw new CampaignSendError('The email template is empty', 400);
     }
     /**
@@ -260,6 +266,24 @@ const EMAIL_PATTERN = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
         });
         if (block) throw new CampaignSendError(block.reason, 409);
     }
+    /*
+   * THE SITE'S REUSABLE BLOCKS, EXPANDED (AGL-3287).
+   *
+   * A header or footer placed in the design is a `reusableInstance` naming one
+   * of the site's components, and the mail renderer draws a node it does not
+   * know as nothing — so without this every campaign went out without the
+   * blocks its author could see on the canvas. Grafted from the components'
+   * PUBLISHED definitions, read fresh, never from a cache: a send is not a
+   * page, and a header republished a minute ago is the one the author expects.
+   *
+   * BEFORE the product scan below, which is the ordering that matters: a
+   * product block inside a footer only exists once the footer is grafted.
+   * Each placement's property values and attribute overrides apply; its style
+   * overrides land in `sx`, which the mail renderer does not read.
+   */ const nodes = await composeHostComponentNodes(stored, {
+        firestore,
+        hostId
+    });
     // Resolve emailProduct references (by id — rename-safe, AGL-343).
     const productIds = [
         ...new Set(Object.values(nodes).filter((node)=>(node == null ? void 0 : node.componentId) === 'emailProduct').map((node)=>{
@@ -1070,7 +1094,12 @@ export async function performCampaignSend(options) {
    * is a keyed lookup per address, so its cost is the size of what is being
    * mailed, and asking about people this send will not reach would buy a
    * larger read for a number nobody acts on.
-   */ const notSuppressed = await filterSendableForHost(hostId, recipients, firestore);
+   *
+   * All three per-site filters below read across `consentGroup` — the same
+   * controller the consent join above was read for. A person who left one
+   * site of a declared group left the sender, and the send is the sender's.
+   * A group of one reads exactly what the site alone always read.
+   */ const notSuppressed = await filterSendableForHost(hostId, recipients, firestore, consentGroup);
     /*
    * The THIRD list, and the narrowest: who has left THIS stream.
    *
@@ -1079,7 +1108,7 @@ export async function performCampaignSend(options) {
    * person who unticked "Promotions and offers" is still a subscriber; a
    * person on either suppression list is not, and asking about their topic
    * preferences would be a read taken on a question already answered.
-   */ const onTopic = await filterTopicSendable(hostId, topicId, notSuppressed, firestore);
+   */ const onTopic = await filterTopicSendable(hostId, topicId, notSuppressed, firestore, consentGroup);
     /*
    * THE FOURTH FILTER: how often the recipient asked to hear from this site.
    *
@@ -1104,7 +1133,8 @@ export async function performCampaignSend(options) {
    * pace is not a stop, and the two suppression lists above have already
    * removed everybody who asked us to stop entirely.
    */ const sendable = await filterCadenceSendable(hostId, onTopic, {
-        firestore
+        firestore,
+        group: consentGroup
     });
     /*
    * NOBODY IN THIS BATCH, BUT SOMEBODY AFTER IT.