@dev.smartpricing/message-composer-utils 4.3.2-fix.1 → 4.5.1-next.0

package/dist/types/message.js

@@ -9,6 +9,28 @@ export const MESSAGE_STATUS = [
 ];
 export const MESSAGE_GROUP_CATEGORIES = ["marketing", "utility"];
 export const MESSAGE_GROUP_VISIBILITY = ["public", "internal"];
+/** `visibility` filter of the list route; `internal` and `all` are admin-only. */
+export const MESSAGE_GROUP_LIST_VISIBILITY = [
+    ...MESSAGE_GROUP_VISIBILITY,
+    "all",
+];
+/** Sortable columns of the list route (ADR 0012); aggregates are not sortable. */
+export const MESSAGE_GROUP_LIST_SORT = [
+    "name",
+    "category",
+    "created_at",
+    "updated_at",
+];
+/**
+ * The Smartness application a Message Group is authored for (ADR 0011).
+ * Anything outside this list is not a Product and is rejected on write.
+ */
+export const MESSAGE_GROUP_PRODUCTS = [
+    "connect",
+    "chat",
+    "pms",
+    "pricing",
+];
 /**
  * Brand cascade data schema for preview validation.
  * Subset of BrandFromDb used at compile time.
@@ -24,6 +46,8 @@ export const brandCascadeDataSchema = z.object({
  * Request body for previewing a message with inline data (no DB lookups).
  */
 export const previewMessageRequestSchema = z.object({
+    /** Organization the preview is compiled for (ADR 0014). */
+    organization_id: z.uuid().optional(),
     message: z
         .object({
         render_type: z.literal("email_v1"),

package/dist/types/message.js.map

@@ -1 +1 @@
-{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/types/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAUxB,OAAO,EACL,+BAA+B,EAC/B,gCAAgC,EAChC,eAAe,GAChB,MAAM,YAAY,CAAC;AAEpB,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,aAAa,EAAE,UAAU,CAAU,CAAC;AAGzE,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,SAAS;IACT,OAAO;IACP,UAAU;IACV,UAAU;CACF,CAAC;AAmDX,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,WAAW,EAAE,SAAS,CAAU,CAAC;AAG1E,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAU,CAAC;AA8DxE;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,sBAAsB,EAAE,+BAA+B;IACvD,uBAAuB,EAAE,gCAAgC;IACzD,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC5D,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;CAC7C,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IAClD,OAAO,EAAE,CAAC;SACP,MAAM,CAAC;QACN,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;QAClC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;QACvB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;YACb,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;YACnB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAClD,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;SAC5C,CAAC;QACF,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;KACvD,CAAC;SACD,WAAW,EAAE;IAChB,KAAK,EAAE,sBAAsB,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CACpD,CAAC,CAAC"}
+{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/types/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,OAAO,EACL,+BAA+B,EAC/B,gCAAgC,EAChC,eAAe,GAChB,MAAM,YAAY,CAAC;AAEpB,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,aAAa,EAAE,UAAU,CAAU,CAAC;AAGzE,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,SAAS;IACT,OAAO;IACP,UAAU;IACV,UAAU;CACF,CAAC;AAmDX,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,WAAW,EAAE,SAAS,CAAU,CAAC;AAG1E,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAU,CAAC;AAGxE,kFAAkF;AAClF,MAAM,CAAC,MAAM,6BAA6B,GAAG;IAC3C,GAAG,wBAAwB;IAC3B,KAAK;CACG,CAAC;AAIX,kFAAkF;AAClF,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,MAAM;IACN,UAAU;IACV,YAAY;IACZ,YAAY;CACJ,CAAC;AAsBX;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,SAAS;IACT,MAAM;IACN,KAAK;IACL,SAAS;CACD,CAAC;AAoEX;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,sBAAsB,EAAE,+BAA+B;IACvD,uBAAuB,EAAE,gCAAgC;IACzD,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC5D,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;CAC7C,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IAClD,2DAA2D;IAC3D,eAAe,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;IACpC,OAAO,EAAE,CAAC;SACP,MAAM,CAAC;QACN,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;QAClC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;QACvB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;YACb,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;YACnB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAClD,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;SAC5C,CAAC;QACF,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;KACvD,CAAC;SACD,WAAW,EAAE;IAChB,KAAK,EAAE,sBAAsB,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;CACpD,CAAC,CAAC"}

package/dist/types/organization.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=organization.js.map

package/dist/types/organization.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"organization.js","sourceRoot":"","sources":["../../src/types/organization.ts"],"names":[],"mappings":""}

package/dist/types/pagination.js

@@ -0,0 +1,2 @@
+export const SORT_ORDER = ["asc", "desc"];
+//# sourceMappingURL=pagination.js.map

package/dist/types/pagination.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../src/types/pagination.ts"],"names":[],"mappings":"AAkCA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,MAAM,CAAU,CAAC"}

package/dist/utils/templates/whatsapp-compiler.test.js

@@ -0,0 +1,241 @@
+import { describe, it, expect } from "vitest";
+import { compileWhatsappTemplate, extractRequiredParameters, validateParameters, } from "./whatsapp-compiler.js";
+import { mergeBrandDataParams, } from "./brand-cascade.js";
+const mention = (label) => ({
+    type: "mention",
+    attrs: { id: label, label },
+});
+const text = (value) => ({ type: "text", text: value });
+const doc = (...content) => ({
+    type: "doc",
+    content: [{ type: "paragraph", content }],
+});
+/** An approved, submitted WhatsApp Message with every block empty by default. */
+function whatsappMessage(body = {}) {
+    return {
+        id: "msg-1",
+        created_at: new Date("2026-09-01T00:00:00.000Z"),
+        updated_at: new Date("2026-09-01T00:00:00.000Z"),
+        message_group_id: "group-1",
+        language_id: "en",
+        status: "approved",
+        render_type: "whatsapp_v1",
+        user_id: "user-1",
+        body: {
+            header: { type: "none" },
+            body: { enabled: true, content: undefined },
+            footer: { enabled: false, content: "" },
+            buttons: { enabled: false, buttons: [] },
+            ...body,
+        },
+        metadata: {
+            meta: {
+                template_id: "1234567890",
+                template_name: "welcome_en",
+                submission_date: "2026-09-01T00:00:00.000Z",
+                translated_template: {
+                    name: "welcome_en",
+                    language: "en",
+                    category: "UTILITY",
+                    parameter_format: "NAMED",
+                    allow_category_change: false,
+                    components: [],
+                },
+            },
+        },
+    };
+}
+describe("extractRequiredParameters", () => {
+    it("lists header, body and URL button keys once each, in template order", () => {
+        const message = whatsappMessage({
+            header: {
+                type: "text",
+                content: doc(text("Hi "), mention("guest_name")),
+            },
+            body: {
+                enabled: true,
+                content: doc(mention("guest_name"), text(" your stay at "), mention("brand_name"), text(" starts "), mention("check_in")),
+            },
+            buttons: {
+                enabled: true,
+                buttons: [
+                    {
+                        id: "b1",
+                        type: "link",
+                        text: "Open",
+                        url: "https://example.com/{{booking_id}}?guest={{guest_name}}",
+                    },
+                ],
+            },
+        });
+        expect(extractRequiredParameters(message)).toEqual([
+            "guest_name",
+            "brand_name",
+            "check_in",
+            "booking_id",
+        ]);
+    });
+    it("returns no keys for a template without variables", () => {
+        const message = whatsappMessage({
+            body: { enabled: true, content: doc(text("Plain text")) },
+        });
+        expect(extractRequiredParameters(message)).toEqual([]);
+    });
+    it("ignores URL buttons when the button block is disabled", () => {
+        const message = whatsappMessage({
+            buttons: {
+                enabled: false,
+                buttons: [
+                    { id: "b1", type: "link", text: "Open", url: "https://x/{{id}}" },
+                ],
+            },
+        });
+        expect(extractRequiredParameters(message)).toEqual([]);
+    });
+});
+describe("validateParameters with brand_* keys", () => {
+    const message = whatsappMessage({
+        body: {
+            enabled: true,
+            content: doc(mention("guest_name"), text(" @ "), mention("brand_name")),
+        },
+    });
+    const brand = {
+        default_email_settings: {},
+        default_button_settings: {},
+        default_socials: null,
+        logo_url: null,
+        data: { name: "Hotel Sole" },
+    };
+    it("reports brand_name missing when validated on the raw parameters", () => {
+        expect(validateParameters(message, { guest_name: "Mario" })).toEqual({
+            valid: false,
+            required: ["guest_name", "brand_name"],
+            missing: ["brand_name"],
+        });
+    });
+    it("counts brand_name as present once the Brand data is merged in", () => {
+        const merged = mergeBrandDataParams({ guest_name: "Mario" }, brand);
+        expect(validateParameters(message, merged)).toEqual({
+            valid: true,
+            required: ["guest_name", "brand_name"],
+            missing: [],
+        });
+    });
+    it("still reports a brand_* key the Brand cannot supply", () => {
+        const withSlogan = whatsappMessage({
+            body: { enabled: true, content: doc(mention("brand_slogan")) },
+        });
+        const merged = mergeBrandDataParams({}, brand);
+        expect(validateParameters(withSlogan, merged).missing).toEqual([
+            "brand_slogan",
+        ]);
+    });
+});
+describe("compileWhatsappTemplate", () => {
+    it("builds the template envelope from the Meta metadata and language", () => {
+        const payload = compileWhatsappTemplate(whatsappMessage(), {});
+        expect(payload).toEqual({
+            messaging_product: "whatsapp",
+            type: "template",
+            template: {
+                name: "welcome_en",
+                language: { code: "en" },
+                components: undefined,
+            },
+        });
+    });
+    it("throws when the Message has no Meta template name", () => {
+        const message = whatsappMessage();
+        message.metadata = {};
+        expect(() => compileWhatsappTemplate(message, {})).toThrow("Message does not have Meta template name in metadata");
+    });
+    it("emits a HEADER component with the header text variable", () => {
+        const message = whatsappMessage({
+            header: {
+                type: "text",
+                content: doc(text("Hi "), mention("guest_name")),
+            },
+        });
+        const payload = compileWhatsappTemplate(message, { guest_name: "Mario" });
+        expect(payload.template.components).toEqual([
+            {
+                type: "HEADER",
+                parameters: [
+                    { type: "text", text: "Mario", parameter_name: "guest_name" },
+                ],
+            },
+        ]);
+    });
+    it("emits BODY named parameters in order, coercing values to strings", () => {
+        const message = whatsappMessage({
+            body: {
+                enabled: true,
+                content: doc(mention("guest_name"), text(", "), mention("nights"), text(" nights, "), mention("missing_key")),
+            },
+        });
+        const payload = compileWhatsappTemplate(message, {
+            guest_name: "Mario",
+            nights: 3,
+        });
+        expect(payload.template.components).toEqual([
+            {
+                type: "BODY",
+                parameters: [
+                    { type: "text", text: "Mario", parameter_name: "guest_name" },
+                    { type: "text", text: "3", parameter_name: "nights" },
+                    { type: "text", text: "", parameter_name: "missing_key" },
+                ],
+            },
+        ]);
+    });
+    it("emits a media HEADER by smartchat media id", () => {
+        const message = whatsappMessage({
+            header: {
+                type: "image",
+                url: "https://cdn.example.com/hero.png",
+                smartchatMediaId: "media-42",
+            },
+        });
+        const payload = compileWhatsappTemplate(message, {});
+        expect(payload.template.components).toEqual([
+            {
+                type: "HEADER",
+                parameters: [{ type: "image", image: { id: "media-42" } }],
+            },
+        ]);
+    });
+    it("omits the media HEADER when the media id is not resolved", () => {
+        const message = whatsappMessage({
+            header: { type: "image", url: "https://cdn.example.com/hero.png" },
+        });
+        const payload = compileWhatsappTemplate(message, {});
+        expect(payload.template.components).toBeUndefined();
+    });
+    it("emits a URL BUTTON component named by button position, as submitted to Meta", () => {
+        const message = whatsappMessage({
+            buttons: {
+                enabled: true,
+                buttons: [
+                    { id: "b0", type: "quick_reply", text: "Yes" },
+                    {
+                        id: "b1",
+                        type: "link",
+                        text: "Open",
+                        url: "https://example.com/{{booking_id}}",
+                    },
+                ],
+            },
+        });
+        const payload = compileWhatsappTemplate(message, { booking_id: "abc" });
+        expect(payload.template.components).toEqual([
+            {
+                type: "BUTTON",
+                sub_type: "url",
+                index: "1",
+                parameters: [{ type: "text", text: "abc", parameter_name: "{{2}}" }],
+            },
+        ]);
+    });
+});
+//# sourceMappingURL=whatsapp-compiler.test.js.map

package/dist/utils/templates/whatsapp-compiler.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"whatsapp-compiler.test.js","sourceRoot":"","sources":["../../../src/utils/templates/whatsapp-compiler.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAG9C,OAAO,EACL,uBAAuB,EACvB,yBAAyB,EACzB,kBAAkB,GACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,oBAAoB,GAErB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,OAAO,GAAG,CAAC,KAAa,EAAe,EAAE,CAAC,CAAC;IAC/C,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;CAC5B,CAAC,CAAC;AACH,MAAM,IAAI,GAAG,CAAC,KAAa,EAAe,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AAC7E,MAAM,GAAG,GAAG,CAAC,GAAG,OAAsB,EAAe,EAAE,CAAC,CAAC;IACvD,IAAI,EAAE,KAAK;IACX,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;CAC1C,CAAC,CAAC;AAEH,iFAAiF;AACjF,SAAS,eAAe,CACtB,OAAyC,EAAE;IAE3C,OAAO;QACL,EAAE,EAAE,OAAO;QACX,UAAU,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC;QAChD,UAAU,EAAE,IAAI,IAAI,CAAC,0BAA0B,CAAC;QAChD,gBAAgB,EAAE,SAAS;QAC3B,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE,UAAU;QAClB,WAAW,EAAE,aAAa;QAC1B,OAAO,EAAE,QAAQ;QACjB,IAAI,EAAE;YACJ,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;YACxB,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE;YAC3C,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE;YACvC,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE;YACxC,GAAG,IAAI;SACR;QACD,QAAQ,EAAE;YACR,IAAI,EAAE;gBACJ,WAAW,EAAE,YAAY;gBACzB,aAAa,EAAE,YAAY;gBAC3B,eAAe,EAAE,0BAA0B;gBAC3C,mBAAmB,EAAE;oBACnB,IAAI,EAAE,YAAY;oBAClB,QAAQ,EAAE,IAAI;oBACd,QAAQ,EAAE,SAAS;oBACnB,gBAAgB,EAAE,OAAO;oBACzB,qBAAqB,EAAE,KAAK;oBAC5B,UAAU,EAAE,EAAE;iBACf;aACF;SACF;KACF,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,MAAM,OAAO,GAAG,eAAe,CAAC;YAC9B,MAAM,EAAE;gBACN,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;aACjD;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,GAAG,CACV,OAAO,CAAC,YAAY,CAAC,EACrB,IAAI,CAAC,gBAAgB,CAAC,EACtB,OAAO,CAAC,YAAY,CAAC,EACrB,IAAI,CAAC,UAAU,CAAC,EAChB,OAAO,CAAC,UAAU,CAAC,CACpB;aACF;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE;oBACP;wBACE,EAAE,EAAE,IAAI;wBACR,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,MAAM;wBACZ,GAAG,EAAE,yDAAyD;qBAC/D;iBACF;aACF;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;YACjD,YAAY;YACZ,YAAY;YACZ,UAAU;YACV,YAAY;SACb,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,OAAO,GAAG,eAAe,CAAC;YAC9B,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE;SAC1D,CAAC,CAAC;QACH,MAAM,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;QAC/D,MAAM,OAAO,GAAG,eAAe,CAAC;YAC9B,OAAO,EAAE;gBACP,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE;oBACP,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,kBAAkB,EAAE;iBAClE;aACF;SACF,CAAC,CAAC;QACH,MAAM,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,sCAAsC,EAAE,GAAG,EAAE;IACpD,MAAM,OAAO,GAAG,eAAe,CAAC;QAC9B,IAAI,EAAE;YACJ,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;SACxE;KACF,CAAC,CAAC;IACH,MAAM,KAAK,GAAqB;QAC9B,sBAAsB,EAAE,EAAE;QAC1B,uBAAuB,EAAE,EAAE;QAC3B,eAAe,EAAE,IAAI;QACrB,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE;KAC7B,CAAC;IAEF,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YACnE,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC;YACtC,OAAO,EAAE,CAAC,YAAY,CAAC;SACxB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;QACvE,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;QACpE,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YAClD,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,CAAC;YACtC,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,UAAU,GAAG,eAAe,CAAC;YACjC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,EAAE;SAC/D,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAC/C,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;YAC7D,cAAc;SACf,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,OAAO,GAAG,uBAAuB,CAAC,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/D,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;YACtB,iBAAiB,EAAE,UAAU;YAC7B,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE;gBACR,IAAI,EAAE,YAAY;gBAClB,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;gBACxB,UAAU,EAAE,SAAS;aACtB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,OAAO,GAAG,eAAe,EAAE,CAAC;QAClC,OAAO,CAAC,QAAQ,GAAG,EAAE,CAAC;QACtB,MAAM,CAAC,GAAG,EAAE,CAAC,uBAAuB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CACxD,sDAAsD,CACvD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAChE,MAAM,OAAO,GAAG,eAAe,CAAC;YAC9B,MAAM,EAAE;gBACN,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;aACjD;SACF,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1E,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YAC1C;gBACE,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE;iBAC9D;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,OAAO,GAAG,eAAe,CAAC;YAC9B,IAAI,EAAE;gBACJ,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,GAAG,CACV,OAAO,CAAC,YAAY,CAAC,EACrB,IAAI,CAAC,IAAI,CAAC,EACV,OAAO,CAAC,QAAQ,CAAC,EACjB,IAAI,CAAC,WAAW,CAAC,EACjB,OAAO,CAAC,aAAa,CAAC,CACvB;aACF;SACF,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE;YAC/C,UAAU,EAAE,OAAO;YACnB,MAAM,EAAE,CAAC;SACV,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YAC1C;gBACE,IAAI,EAAE,MAAM;gBACZ,UAAU,EAAE;oBACV,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE;oBAC7D,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,QAAQ,EAAE;oBACrD,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,cAAc,EAAE,aAAa,EAAE;iBAC1D;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,OAAO,GAAG,eAAe,CAAC;YAC9B,MAAM,EAAE;gBACN,IAAI,EAAE,OAAO;gBACb,GAAG,EAAE,kCAAkC;gBACvC,gBAAgB,EAAE,UAAU;aAC7B;SACF,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACrD,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YAC1C;gBACE,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC;aAC3D;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,OAAO,GAAG,eAAe,CAAC;YAC9B,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,kCAAkC,EAAE;SACnE,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACrD,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,aAAa,EAAE,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6EAA6E,EAAE,GAAG,EAAE;QACrF,MAAM,OAAO,GAAG,eAAe,CAAC;YAC9B,OAAO,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE;oBACP,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,EAAE;oBAC9C;wBACE,EAAE,EAAE,IAAI;wBACR,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,MAAM;wBACZ,GAAG,EAAE,oCAAoC;qBAC1C;iBACF;aACF;SACF,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,uBAAuB,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QACxE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC;YAC1C;gBACE,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,GAAG;gBACV,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC;aACrE;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dev.smartpricing/message-composer-utils",
-  "version": "4.3.2-fix.1",
+  "version": "4.5.1-next.0",
   "description": "Shared types and utilities for the message composer",
   "type": "module",
   "exports": {

package/src/schemas/brand.ts

@@ -7,10 +7,12 @@ import {
   BrandProperty,
 } from "../types/index.js";
 import { dbTimestampSchema } from "./common.js";
+import { organizationFilterQuerySchema } from "./organization.js";
 
 export const listBrandsQuerySchema = z.object({
   sort_by: z.enum(["created_at", "name"]).catch("created_at"),
   direction: z.enum(["asc", "desc"]).catch("asc"),
+  ...organizationFilterQuerySchema.shape,
 });
 
 export const byPropertyParamsSchema = z.object({

package/src/schemas/dynamic-values.ts

@@ -1,10 +1,17 @@
 import { z } from "zod";
-import { DynamicValuesResponse } from "../types/index.js";
+import {
+  DynamicValuesResponse,
+  MESSAGE_GROUP_PRODUCTS,
+} from "../types/index.js";
+import { organizationLookupQuerySchema } from "./organization.js";
 
 export const dynamicValuesQuerySchema = z.object({
-  product: z.string({ error: "product query parameter is required" }),
+  product: z.enum(MESSAGE_GROUP_PRODUCTS, {
+    error: "product query parameter is required and must be a Product",
+  }),
   context: z.string().optional(),
   language: z.string().default("en"),
+  ...organizationLookupQuerySchema.shape,
 });
 
 export const dynamicValuesResponseSchema = z.record(

package/src/schemas/index.ts

@@ -1,4 +1,5 @@
 export * from "./common.js";
+export * from "./pagination.js";
 export * from "./ai-integration.js";
 export * from "./brand.js";
 export * from "./dynamic-values.js";

package/src/schemas/message-compilation.ts

@@ -4,6 +4,7 @@ import {
   CompileAndSendRequest,
   previewMessageRequestSchema,
 } from "../types/index.js";
+import { organizationBodySchema } from "./organization.js";
 
 export const messageLanguageQuerySchema = z.object({
   language: z.string(),
@@ -30,6 +31,7 @@ export const compileAndSendBodySchema = compileMessageBodySchema.extend({
 }) satisfies z.ZodType<CompileAndSendRequest>;
 
 export const testEmailBodySchema = z.object({
+  ...organizationBodySchema.shape,
   message: previewMessageRequestSchema.shape.message,
   to: z.string().min(1, "Missing required parameters: message, to"),
   brand_id: z.string().nullable().optional(),

package/src/schemas/message-group.test.ts

@@ -0,0 +1,20 @@
+import { describe, it, expect } from "vitest";
+import { listMessageGroupsQuerySchema } from "./message-group.js";
+
+describe("listMessageGroupsQuerySchema: the WABA filter", () => {
+  it("keeps the WABA a list is narrowed to", () => {
+    expect(
+      listMessageGroupsQuerySchema.parse({ waba_id: "waba-1" }).waba_id,
+    ).toBe("waba-1");
+  });
+
+  it("is optional: a list without it spans every WABA", () => {
+    expect(listMessageGroupsQuerySchema.parse({}).waba_id).toBeUndefined();
+  });
+
+  it("rejects an empty WABA", () => {
+    expect(
+      listMessageGroupsQuerySchema.safeParse({ waba_id: "" }).success,
+    ).toBe(false);
+  });
+});

package/src/schemas/message-group.ts

@@ -1,21 +1,52 @@
 import { z } from "zod";
 import {
   DuplicateMessageGroupBody,
+  ListMessageGroupsQuery,
   MessageGroupFromDb,
   MessageGroupWithMessageSummary,
   MESSAGE_GROUP_CATEGORIES,
+  MESSAGE_GROUP_LIST_SORT,
+  MESSAGE_GROUP_LIST_VISIBILITY,
+  MESSAGE_GROUP_PRODUCTS,
   MESSAGE_GROUP_VISIBILITY,
   MESSAGE_STATUS,
   MESSAGE_RENDER_TYPES,
+  SORT_ORDER,
 } from "../types/index.js";
 import { dbTimestampSchema } from "./common.js";
+import {
+  paginatedResponseSchema,
+  paginationQuerySchema,
+} from "./pagination.js";
 import { messageResponseSchema } from "./message.js";
+import {
+  organizationBodySchema,
+  organizationFilterQuerySchema,
+} from "./organization.js";
 
-export const listMessageGroupsQuerySchema = z.object({
-  render_type: z.string().optional(),
-  tags: z.union([z.string(), z.array(z.string())]).optional(),
-  tags_mode: z.enum(["and", "or"]).default("and"),
-});
+/**
+ * GET /message-groups: server-side filter, sort and pagination (ADR 0012).
+ * `visibility` other than `public` is admin-only (403 otherwise, enforced by
+ * the route). An empty or whitespace `search` is treated as absent.
+ */
+export const listMessageGroupsQuerySchema = paginationQuerySchema.extend({
+  ...organizationFilterQuerySchema.shape,
+  search: z
+    .string()
+    .trim()
+    .max(200)
+    .optional()
+    .transform((value) => (value === "" ? undefined : value)),
+  category: z.enum(MESSAGE_GROUP_CATEGORIES).optional(),
+  status: z.enum(MESSAGE_STATUS).optional(),
+  product: z.enum(MESSAGE_GROUP_PRODUCTS).optional(),
+  visibility: z.enum(MESSAGE_GROUP_LIST_VISIBILITY).default("public"),
+  render_type: z.enum(MESSAGE_RENDER_TYPES).optional(),
+  waba_id: z.string().min(1).optional(),
+  sort: z.enum(MESSAGE_GROUP_LIST_SORT).default("updated_at"),
+  order: z.enum(SORT_ORDER).default("desc"),
+}) satisfies z.ZodType<ListMessageGroupsQuery, unknown>;
+export type { ListMessageGroupsQuery };
 
 export const updateMessageGroupBodySchema = z.object({
   name: z
@@ -24,20 +55,25 @@ export const updateMessageGroupBodySchema = z.object({
       (name) => name.trim() !== "",
       "Name is required and cannot be empty",
     ),
+  product: z.enum(MESSAGE_GROUP_PRODUCTS).optional(),
   brand_id: z.string().nullable().optional(),
 });
 
 export const createMessageGroupBodySchema = z.object({
+  ...organizationBodySchema.shape,
   name: z.string(),
   category: z.enum(MESSAGE_GROUP_CATEGORIES),
+  product: z.enum(MESSAGE_GROUP_PRODUCTS),
   visibility: z.enum(MESSAGE_GROUP_VISIBILITY).optional(),
   brand_id: z.string().nullable().optional(),
 });
 
 export const duplicateMessageGroupBodySchema = z
   .object({
+    ...organizationBodySchema.shape,
     name: z.string().optional(),
     visibility: z.enum(MESSAGE_GROUP_VISIBILITY).optional(),
+    product: z.enum(MESSAGE_GROUP_PRODUCTS).optional(),
     brand_id: z.string().nullable().optional(),
   })
   .optional() satisfies z.ZodType<DuplicateMessageGroupBody | undefined>;
@@ -47,9 +83,11 @@ export const messageGroupResponseSchema = z.object({
   id: z.uuid(),
   name: z.string(),
   category: z.enum(MESSAGE_GROUP_CATEGORIES),
+  product: z.enum(MESSAGE_GROUP_PRODUCTS),
   visibility: z.enum(MESSAGE_GROUP_VISIBILITY).nullable().optional(),
   brand_id: z.string().nullable().optional(),
   organization_id: z.string().nullable().optional(),
+  waba_id: z.string().nullable().optional(),
   user_id: z.string(),
   created_at: dbTimestampSchema,
   updated_at: dbTimestampSchema,
@@ -80,7 +118,8 @@ export const messageGroupWithMessageSummaryResponseSchema =
     ),
   }) satisfies z.ZodType<unknown, MessageGroupWithMessageSummary>;
 
-export const messageGroupSummaryListResponseSchema = z.array(
+/** Paginated envelope of list items (ADR 0012). */
+export const messageGroupSummaryListResponseSchema = paginatedResponseSchema(
   messageGroupWithMessageSummaryResponseSchema,
 );
 

package/src/schemas/meta-integration.test.ts

@@ -0,0 +1,20 @@
+import { describe, it, expect } from "vitest";
+import { submitToWabaBodySchema } from "./meta-integration.js";
+
+describe("submitToWabaBodySchema", () => {
+  it("accepts a submission that names its WABA", () => {
+    expect(submitToWabaBodySchema.parse({ waba_id: "waba-1" })).toEqual({
+      waba_id: "waba-1",
+    });
+  });
+
+  it("is optional: no body and an empty body both name no WABA", () => {
+    expect(submitToWabaBodySchema.parse(undefined)).toBeUndefined();
+    expect(submitToWabaBodySchema.parse(null)).toBeNull();
+    expect(submitToWabaBodySchema.parse({})).toEqual({});
+  });
+
+  it.each(["", 42, null])("rejects the WABA %j", (waba_id) => {
+    expect(submitToWabaBodySchema.safeParse({ waba_id }).success).toBe(false);
+  });
+});

package/src/schemas/meta-integration.ts

@@ -1,5 +1,10 @@
 import { z } from "zod";
-import { SubmissionJob, SubmissionJobResponse } from "../types/index.js";
+import {
+  OrganizationWaba,
+  SubmissionJob,
+  SubmitToWabaBody,
+  SubmissionJobResponse,
+} from "../types/index.js";
 import { dbTimestampSchema } from "./common.js";
 
 export const messageIdParamsSchema = z.object({
@@ -45,3 +50,27 @@ export const submitGroupAcceptedResponseSchema = z.object({
   status: z.literal("queued"),
   message: z.string(),
 }) satisfies z.ZodType<SubmissionJobResponse>;
+
+/**
+ * GET /integrations/meta/wabas: the WABAs of the Organization named in the
+ * query (`organizationLookupQuerySchema`), empty when it has none (ADR 0015).
+ */
+export const organizationWabasResponseSchema = z.array(
+  z.object({
+    id: z.string(),
+    name: z.string(),
+    phone_numbers: z.array(z.string()),
+  }),
+) satisfies z.ZodType<OrganizationWaba[]>;
+
+/**
+ * Body of the public submit routes (ADR 0015). `waba_id` names the WABA a
+ * Message Group is submitted to at its first submission; it is required only
+ * when the Organization has several and the Message Group has none yet.
+ */
+export const submitToWabaBodySchema = z
+  .object({
+    waba_id: z.string().min(1).optional(),
+  })
+  // A POST with no body reaches the route as null.
+  .nullish() satisfies z.ZodType<SubmitToWabaBody | null | undefined>;

package/src/schemas/onboarding.ts

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import {
+  MESSAGE_GROUP_PRODUCTS,
   brandDefaultEmailSettingsSchema,
   brandDefaultButtonSettingsSchema,
   brandSocialsSchema,
@@ -21,6 +22,8 @@ export const onboardingBodySchema = z.object({
   userId: z
     .string({ error: "Both organizationId and userId are required" })
     .min(1, "Both organizationId and userId are required"),
+  // Required, no fallback to the sm-product header (ADR 0011)
+  product: z.enum(MESSAGE_GROUP_PRODUCTS),
   tags: z.array(z.string()).optional(),
 });