@jhits/plugin-newsletter 0.0.16 → 0.0.17

package/dist/api/email-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"email-utils.d.ts","sourceRoot":"","sources":["../../src/api/email-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,mBAAmB,EAAsB,MAAM,qBAAqB,CAAC;AAqC9E,wBAAsB,gBAAgB,CAClC,MAAM,EAAE,mBAAmB,EAC3B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAoHf"}
+{"version":3,"file":"email-utils.d.ts","sourceRoot":"","sources":["../../src/api/email-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,mBAAmB,EAAsB,MAAM,qBAAqB,CAAC;AA0E9E,wBAAsB,gBAAgB,CAClC,MAAM,EAAE,mBAAmB,EAC3B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAgIf"}

package/dist/api/email-utils.js

@@ -21,10 +21,42 @@ async function getSmtpConfig(config) {
             from: smtpConfig.from,
             fromName: smtpConfig.fromName || '',
             logoUrl: smtpConfig.logoUrl || '',
+            unsubscribeTranslations: smtpConfig.unsubscribeTranslations || {},
         };
     }
     return null;
 }
+async function resolveBaseUrl(config, language) {
+    try {
+        const dbConnection = await config.getDb();
+        const db = dbConnection.db();
+        const settings = db.collection('settings');
+        // Try to get site config from plugin-website (stored in 'settings' collection with identifier 'site_config')
+        const siteConfig = await settings.findOne({ identifier: 'site_config' });
+        if (siteConfig && siteConfig.domainLocaleConfig && Array.isArray(siteConfig.domainLocaleConfig)) {
+            // Find domain for this locale
+            const localeConfig = siteConfig.domainLocaleConfig.find((c) => c.locale === language);
+            if (localeConfig && localeConfig.domain && localeConfig.domain !== 'undefined' && localeConfig.domain.trim() !== '') {
+                const domain = localeConfig.domain.trim();
+                // Add protocol if missing
+                if (!domain.startsWith('http')) {
+                    const protocol = domain.includes('localhost') ? 'http' : 'https';
+                    return `${protocol}://${domain}`;
+                }
+                return domain;
+            }
+        }
+    }
+    catch (error) {
+        console.warn('[NewsletterAPI] Failed to resolve language-specific base URL:', error);
+    }
+    // Fallback to default, carefully checking for 'undefined' string
+    const fallback = process.env.NEXT_PUBLIC_SITE_URL;
+    if (fallback && fallback !== 'undefined' && fallback.trim() !== '') {
+        return fallback;
+    }
+    return 'https://botanicsandyou.com';
+}
 export async function sendWelcomeEmail(config, email, language, host) {
     const smtpConfig = await getSmtpConfig(config);
     if (!smtpConfig)
@@ -32,9 +64,8 @@ export async function sendWelcomeEmail(config, email, language, host) {
     const { blocks, metadata } = await GET_WELCOME_EMAIL_CONTENT(undefined, config, language);
     const isDutch = language === 'nl';
     const isSwedish = language === 'sv';
-    const baseUrl = host
-        ? (host.includes('localhost') ? 'http' : 'https') + '://' + host
-        : config.baseUrl || 'https://bya.jorishummel.com';
+    // Resolve base URL based on language settings from plugin-website
+    const baseUrl = await resolveBaseUrl(config, language);
     const slugs = {
         sv: '/avmälla',
         nl: '/afmelden',
@@ -75,11 +106,17 @@ export async function sendWelcomeEmail(config, email, language, host) {
         }
         if (blocks && blocks.length > 0) {
             const { generateNewsletterEmailHtml } = await import('../lib/email/EmailRenderer');
+            // Get unsubscribe text (Priority: metadata manual override > global SMTP translation > hardcoded localized default)
+            const globalTranslations = smtpConfig.unsubscribeTranslations || {};
+            const hardcodedDefaults = { en: 'Unsubscribe', nl: 'Afmelden', sv: 'Avanmälan' };
+            const defaultText = globalTranslations[language] || hardcodedDefaults[language] || hardcodedDefaults.en;
+            const unsubscribeText = metadata?.unsubscribeText || defaultText;
             html = generateNewsletterEmailHtml(blocks, { subject: metadata?.subject || '', previewText: metadata?.previewText || '' }, {
                 baseUrl,
                 locale: language,
                 logoUrl: logoSrc,
                 unsubscribeUrl,
+                unsubscribeText,
                 footerText: `© ${new Date().getFullYear()} ${smtpConfig.fromName || 'Botanics & You'}`,
             });
             subject = metadata?.subject || (isDutch ? 'Welkom!' : isSwedish ? 'Välkommen!' : 'Welcome!');
@@ -100,6 +137,10 @@ export async function sendWelcomeEmail(config, email, language, host) {
                     return;
                 }
             }
+            // Get unsubscribe text for legacy template too
+            const globalTranslations = smtpConfig.unsubscribeTranslations || {};
+            const hardcodedDefaults = { en: 'Unsubscribe', nl: 'Afmelden', sv: 'Avanmälan' };
+            const unsubscribeText = globalTranslations[language] || hardcodedDefaults[language] || hardcodedDefaults.en;
             const template = handlebars.compile(templateContent);
             html = template({
                 fromName: smtpConfig.fromName || 'Botanics & You',
@@ -110,7 +151,7 @@ export async function sendWelcomeEmail(config, email, language, host) {
                         ? 'Tack för att du är en del av vår community. Vi tror att naturen ger oss allt vi verkligen behöver.'
                         : 'Thank you for joining our community. We believe that nature provides everything we truly need.',
                 unsubscribeUrl,
-                unsubscribeText: isDutch ? 'Afmelden' : isSwedish ? 'Avanmälan' : 'Unsubscribe',
+                unsubscribeText,
                 tagline: isDutch ? 'Natuurlijk verbonden' : isSwedish ? 'Naturligt ansluten' : 'Naturally connected',
                 currentYear: new Date().getFullYear(),
             });

package/dist/api/handlers/send-newsletter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"send-newsletter.d.ts","sourceRoot":"","sources":["../../../src/api/handlers/send-newsletter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AA4C7D,wBAAsB,oBAAoB,CACtC,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAwNvB;AAED,wBAAsB,uBAAuB,CACzC,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAuCvB"}
+{"version":3,"file":"send-newsletter.d.ts","sourceRoot":"","sources":["../../../src/api/handlers/send-newsletter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAiF7D,wBAAsB,oBAAoB,CACtC,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CA8OvB;AAED,wBAAsB,uBAAuB,CACzC,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAuCvB"}

package/dist/api/handlers/send-newsletter.js

@@ -19,6 +19,7 @@ async function getSmtpConfig(config) {
             from: smtpConfig.from,
             fromName: smtpConfig.fromName || '',
             logoUrl: smtpConfig.logoUrl || '',
+            unsubscribeTranslations: smtpConfig.unsubscribeTranslations || {},
         };
     }
     return null;
@@ -29,6 +30,37 @@ function getNewsletterFilter(idOrSlug) {
     }
     return { slug: idOrSlug };
 }
+async function resolveBaseUrl(config, language) {
+    try {
+        const dbConnection = await config.getDb();
+        const db = dbConnection.db();
+        const settings = db.collection('settings');
+        // Try to get site config from plugin-website (stored in 'settings' collection with identifier 'site_config')
+        const siteConfig = await settings.findOne({ identifier: 'site_config' });
+        if (siteConfig && siteConfig.domainLocaleConfig && Array.isArray(siteConfig.domainLocaleConfig)) {
+            // Find domain for this locale
+            const localeConfig = siteConfig.domainLocaleConfig.find((c) => c.locale === language);
+            if (localeConfig && localeConfig.domain && localeConfig.domain !== 'undefined' && localeConfig.domain.trim() !== '') {
+                const domain = localeConfig.domain.trim();
+                // Add protocol if missing
+                if (!domain.startsWith('http')) {
+                    const protocol = domain.includes('localhost') ? 'http' : 'https';
+                    return `${protocol}://${domain}`;
+                }
+                return domain;
+            }
+        }
+    }
+    catch (error) {
+        console.warn('[NewsletterAPI] Failed to resolve language-specific base URL:', error);
+    }
+    // Fallback to default, carefully checking for 'undefined' string
+    const fallback = process.env.NEXT_PUBLIC_SITE_URL;
+    if (fallback && fallback !== 'undefined' && fallback.trim() !== '') {
+        return fallback;
+    }
+    return 'https://botanicsandyou.com';
+}
 export async function POST_SEND_NEWSLETTER(req, idOrSlug, config) {
     try {
         const userId = await config.getUserId?.(req);
@@ -79,7 +111,15 @@ export async function POST_SEND_NEWSLETTER(req, idOrSlug, config) {
             },
             connectionTimeout: 30000,
         });
-        const baseUrl = config.baseUrl || 'http://localhost:3001';
+        // Resolve base URL based on language settings from plugin-website
+        const baseUrl = await resolveBaseUrl(config, language);
+        // Final sanity check - if domain is STILL undefined, stop sending and ask user for domain
+        if (baseUrl.includes('undefined')) {
+            return NextResponse.json({
+                error: 'Domain not configured for this language. Please define your website domain first.',
+                code: 'DOMAIN_MISSING'
+            }, { status: 400 });
+        }
         let logoAttachment = undefined;
         let logoSrc = smtpConfig.logoUrl || `${baseUrl}/logo_black.svg`;
         if (smtpConfig.logoUrl && smtpConfig.logoUrl.startsWith('data:')) {
@@ -132,18 +172,26 @@ export async function POST_SEND_NEWSLETTER(req, idOrSlug, config) {
             const subscriber = isTest ? null : await subscribers.findOne({ email });
             const subscriberLang = subscriber?.language || language;
             const subscriberSlug = slugs[subscriberLang] || slugs.en;
-            const unsubscribeUrl = `${baseUrl}${subscriberSlug}?email=${encodeURIComponent(email)}`;
-            return { email, unsubscribeUrl };
+            // Resolve correct base URL for this specific subscriber's language
+            const subscriberBaseUrl = await resolveBaseUrl(config, subscriberLang);
+            const unsubscribeUrl = `${subscriberBaseUrl}${subscriberSlug}?email=${encodeURIComponent(email)}`;
+            return { email, unsubscribeUrl, subscriberLang, subscriberBaseUrl };
         }));
         let successCount = 0;
         let failedCount = 0;
-        for (const { email, unsubscribeUrl } of recipientsWithUrls) {
+        for (const { email, unsubscribeUrl, subscriberLang, subscriberBaseUrl } of recipientsWithUrls) {
             try {
+                // Get unsubscribe text (Priority: metadata manual override > global SMTP translation > hardcoded localized default)
+                const globalTranslations = smtpConfig.unsubscribeTranslations || {};
+                const hardcodedDefaults = { en: 'Unsubscribe', nl: 'Afmelden', sv: 'Avanmälan' };
+                const defaultText = globalTranslations[subscriberLang] || hardcodedDefaults[subscriberLang] || hardcodedDefaults.en;
+                const unsubscribeText = metadata?.unsubscribeText || defaultText;
                 const html = generateNewsletterEmailHtml(blocks, { subject: metadata.subject || '', previewText: metadata.previewText || '' }, {
-                    baseUrl,
-                    locale: language,
+                    baseUrl: subscriberBaseUrl,
+                    locale: subscriberLang,
                     logoUrl: logoSrc,
                     unsubscribeUrl,
+                    unsubscribeText,
                     footerText: `© ${new Date().getFullYear()} ${smtpConfig.fromName || 'Botanics & You'}`,
                 });
                 await transporter.sendMail({

package/dist/api/handlers/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../src/api/handlers/settings.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAsB,MAAM,wBAAwB,CAAC;AAoBjF,wBAAsB,YAAY,CAC9B,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CA2BvB;AAED,wBAAsB,aAAa,CAC/B,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAgCvB;AAED,wBAAsB,iBAAiB,CACnC,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CA2CvB;AAED,wBAAsB,kBAAkB,CACpC,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAgDvB;AAwBD,wBAAsB,eAAe,CACjC,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAoLvB"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../src/api/handlers/settings.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAsB,MAAM,wBAAwB,CAAC;AAoBjF,wBAAsB,YAAY,CAC9B,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CA2BvB;AAED,wBAAsB,aAAa,CAC/B,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAgCvB;AAED,wBAAsB,iBAAiB,CACnC,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAqDvB;AAED,wBAAsB,kBAAkB,CACpC,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAiDvB;AA2DD,wBAAsB,eAAe,CACjC,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,mBAAmB,GAC5B,OAAO,CAAC,YAAY,CAAC,CAgMvB"}

package/dist/api/handlers/settings.js

@@ -86,6 +86,11 @@ export async function GET_SMTP_SETTINGS(req, config) {
                 fromName: '',
                 primaryLanguage: 'en',
                 logoUrl: '',
+                unsubscribeTranslations: {
+                    en: 'Unsubscribe',
+                    nl: 'Afmelden',
+                    sv: 'Avanmälan',
+                },
             });
         }
         return NextResponse.json({
@@ -97,6 +102,11 @@ export async function GET_SMTP_SETTINGS(req, config) {
             fromName: smtpConfig.fromName || '',
             primaryLanguage: smtpConfig.primaryLanguage || 'en',
             logoUrl: smtpConfig.logoUrl || '',
+            unsubscribeTranslations: smtpConfig.unsubscribeTranslations || {
+                en: 'Unsubscribe',
+                nl: 'Afmelden',
+                sv: 'Avanmälan',
+            },
         });
     }
     catch (error) {
@@ -128,6 +138,7 @@ export async function POST_SMTP_SETTINGS(req, config) {
                 fromName: body.fromName || '',
                 primaryLanguage: body.primaryLanguage || 'en',
                 logoUrl: body.logoUrl || '',
+                unsubscribeTranslations: body.unsubscribeTranslations || {},
                 updatedAt: new Date(),
                 updatedBy: userId,
             },
@@ -159,6 +170,37 @@ function getSmtpConfigFromDb(config) {
         return null;
     })();
 }
+async function resolveBaseUrl(config, language) {
+    try {
+        const dbConnection = await config.getDb();
+        const db = dbConnection.db();
+        const settings = db.collection('settings');
+        // Try to get site config from plugin-website (stored in 'settings' collection with identifier 'site_config')
+        const siteConfig = await settings.findOne({ identifier: 'site_config' });
+        if (siteConfig && siteConfig.domainLocaleConfig && Array.isArray(siteConfig.domainLocaleConfig)) {
+            // Find domain for this locale
+            const localeConfig = siteConfig.domainLocaleConfig.find((c) => c.locale === language);
+            if (localeConfig && localeConfig.domain && localeConfig.domain !== 'undefined' && localeConfig.domain.trim() !== '') {
+                const domain = localeConfig.domain.trim();
+                // Add protocol if missing
+                if (!domain.startsWith('http')) {
+                    const protocol = domain.includes('localhost') ? 'http' : 'https';
+                    return `${protocol}://${domain}`;
+                }
+                return domain;
+            }
+        }
+    }
+    catch (error) {
+        console.warn('[NewsletterAPI] Failed to resolve language-specific base URL:', error);
+    }
+    // Fallback to default, carefully checking for 'undefined' string
+    const fallback = process.env.NEXT_PUBLIC_SITE_URL;
+    if (fallback && fallback !== 'undefined' && fallback.trim() !== '') {
+        return fallback;
+    }
+    return 'https://botanicsandyou.com';
+}
 export async function POST_TEST_EMAIL(req, config) {
     try {
         const userId = await config.getUserId?.(req);
@@ -194,7 +236,15 @@ export async function POST_TEST_EMAIL(req, config) {
             const altPath = path.join(__dirname, '..', '..', '..', '..', 'templates', 'logo.png');
             logoExists = fs.existsSync(altPath);
         }
-        const baseUrl = config.baseUrl || 'http://localhost:3001';
+        // Resolve base URL based on language settings from plugin-website
+        const baseUrl = await resolveBaseUrl(config, language);
+        // Final sanity check - if domain is STILL undefined, stop sending and ask user for domain
+        if (baseUrl.includes('undefined')) {
+            return NextResponse.json({
+                error: 'Domain not configured for this language. Please define your website domain first.',
+                code: 'DOMAIN_MISSING'
+            }, { status: 400 });
+        }
         let logoAttachment = undefined;
         let logoSrc = smtpConfig.logoUrl || `${baseUrl}/logo_black.svg`;
         if (smtpConfig.logoUrl && smtpConfig.logoUrl.startsWith('data:')) {

package/dist/index.d.ts

@@ -24,23 +24,40 @@ export interface PluginProps {
         /** Background color for dark mode (optional) */
         dark?: string;
     };
+    /** Localized strings for modular blocks in the editor */
+    translations?: Record<string, any>;
+    /** Global translations for unsubscribe text */
+    unsubscribeTranslations?: Record<string, string>;
 }
+/**
+ * Client-facing configuration type
+ * Allows partial overrides of plugin behavior
+ */
+export type NewsletterPluginConfig = Partial<Omit<PluginProps, 'subPath' | 'siteId' | 'locale'>> & {
+    customBlocks?: ClientBlockDefinition[];
+    darkMode?: boolean;
+    backgroundColors?: {
+        light: string;
+        dark?: string;
+    };
+    translations?: Record<string, any>;
+    unsubscribeTranslations?: Record<string, string>;
+    emailConfig?: {
+        logoUrl?: string;
+        logoAlt?: string;
+        footerText?: string;
+        primaryColor?: string;
+    };
+};
 /**
  * Main Router Component
  * Handles routing within the newsletter plugin
- *
- * Client Handshake:
- * - Client apps can pass customBlocks via props
- * - Or via window.__JHITS_PLUGIN_PROPS__['plugin-newsletter'].customBlocks
- * - The EditorProvider will automatically register these blocks
  */
 export default function NewsletterPlugin(props: PluginProps): import("react/jsx-runtime").JSX.Element;
 export { NewsletterPlugin as Index };
-export type { Block, BlockTypeDefinition, ClientBlockDefinition, RichTextFormattingConfig, BlockEditProps, BlockPreviewProps, IBlockComponent, } from './types/block';
-export type { Newsletter, NewsletterStatus, NewsletterMetadata, NewsletterListItem, NewsletterFilterOptions, } from './types/newsletter';
+export type { Block, ClientBlockDefinition } from './types/block';
 export { initNewsletterPlugin } from './init';
-export type { NewsletterPluginConfig } from './init';
-export { EditorProvider, useEditor } from './state/EditorContext';
-export type { EditorProviderProps, EditorState, EditorContextValue } from './state';
 export { blockRegistry } from './registry';
+export { EditorProvider, useEditor } from './state/EditorContext';
+export { BlockRenderer, BlocksRenderer } from './lib/blocks/BlockRenderer';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAOtD;;;GAGG;AACH,MAAM,WAAW,WAAW;IACxB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,yGAAyG;IACzG,YAAY,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACvC,qEAAqE;IACrE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uCAAuC;IACvC,gBAAgB,CAAC,EAAE;QACf,iDAAiD;QACjD,KAAK,EAAE,MAAM,CAAC;QACd,gDAAgD;QAChD,IAAI,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACL;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,KAAK,EAAE,WAAW,2CAiR1D;AAGD,OAAO,EAAE,gBAAgB,IAAI,KAAK,EAAE,CAAC;AAGrC,YAAY,EACR,KAAK,EACL,mBAAmB,EACnB,qBAAqB,EACrB,wBAAwB,EACxB,cAAc,EACd,iBAAiB,EACjB,eAAe,GAClB,MAAM,eAAe,CAAC;AAGvB,YAAY,EACR,UAAU,EACV,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,uBAAuB,GAC1B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAC;AAC9C,YAAY,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AAGrD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClE,YAAY,EAAE,mBAAmB,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAGpF,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAQtD;;;GAGG;AACH,MAAM,WAAW,WAAW;IACxB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,yGAAyG;IACzG,YAAY,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACvC,qEAAqE;IACrE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uCAAuC;IACvC,gBAAgB,CAAC,EAAE;QACf,iDAAiD;QACjD,KAAK,EAAE,MAAM,CAAC;QACd,gDAAgD;QAChD,IAAI,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC,+CAA+C;IAC/C,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpD;AAED;;;GAGG;AACH,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAC,CAAC,GAAG;IAC/F,YAAY,CAAC,EAAE,qBAAqB,EAAE,CAAC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE;QACf,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACnC,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjD,WAAW,CAAC,EAAE;QACV,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;CACL,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,KAAK,EAAE,WAAW,2CA4K1D;AAGD,OAAO,EAAE,gBAAgB,IAAI,KAAK,EAAE,CAAC;AACrC,YAAY,EAAE,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC"}

package/dist/index.js

@@ -13,96 +13,19 @@ import { SettingsView } from './views/SettingsView';
 import { NewsletterManagerView } from './views/NewsletterManager';
 import { NewsletterEditorView } from './views/NewsletterEditor';
 import { editorStateToAPI } from './lib/mappers/apiMapper';
+import { resolvePluginConfig } from './lib/utils/config-resolver';
 /**
  * Main Router Component
  * Handles routing within the newsletter plugin
- *
- * Client Handshake:
- * - Client apps can pass customBlocks via props
- * - Or via window.__JHITS_PLUGIN_PROPS__['plugin-newsletter'].customBlocks
- * - The EditorProvider will automatically register these blocks
  */
 export default function NewsletterPlugin(props) {
-    const { subPath, siteId, locale, customBlocks: propsCustomBlocks, darkMode: propsDarkMode, backgroundColors: propsBackgroundColors } = props;
-    // Get custom blocks from props or window global (client app injection point)
-    const customBlocks = useMemo(() => {
-        // First, try props
-        if (propsCustomBlocks && propsCustomBlocks.length > 0) {
-            return propsCustomBlocks;
-        }
-        // Fallback to window global (for client app injection)
-        if (typeof window !== 'undefined' && window.__JHITS_PLUGIN_PROPS__) {
-            const pluginProps = window.__JHITS_PLUGIN_PROPS__['plugin-newsletter'];
-            if (pluginProps?.customBlocks) {
-                return pluginProps.customBlocks;
-            }
-        }
-        return [];
-    }, [propsCustomBlocks]);
-    // Get dark mode setting from props, localStorage (dev settings), or window global
-    // Priority: localStorage (dev) > props > window global > default
-    const darkMode = useMemo(() => {
-        // First, check localStorage for dev settings (highest priority for dev)
-        if (typeof window !== 'undefined') {
-            try {
-                const saved = localStorage.getItem('__JHITS_PLUGIN_NEWSLETTER_CONFIG__');
-                if (saved) {
-                    const config = JSON.parse(saved);
-                    if (config.darkMode !== undefined) {
-                        return config.darkMode;
-                    }
-                }
-            }
-            catch (e) {
-                // Ignore localStorage errors
-            }
-        }
-        // Then try props
-        if (propsDarkMode !== undefined) {
-            return propsDarkMode;
-        }
-        // Fallback to window global if prop not provided
-        if (typeof window !== 'undefined' && window.__JHITS_PLUGIN_PROPS__) {
-            const pluginProps = window.__JHITS_PLUGIN_PROPS__['plugin-newsletter'];
-            if (pluginProps?.darkMode !== undefined) {
-                return pluginProps.darkMode;
-            }
-        }
-        return true; // Default to dark mode enabled
-    }, [propsDarkMode]);
-    // Get background colors from props, localStorage (dev settings), or window global
-    // Priority: localStorage (dev) > props > window global
-    const backgroundColors = useMemo(() => {
-        // First, check localStorage for dev settings (highest priority for dev)
-        if (typeof window !== 'undefined') {
-            try {
-                const saved = localStorage.getItem('__JHITS_PLUGIN_NEWSLETTER_CONFIG__');
-                if (saved) {
-                    const config = JSON.parse(saved);
-                    if (config.backgroundColors) {
-                        return config.backgroundColors;
-                    }
-                }
-            }
-            catch (e) {
-                // Ignore localStorage errors
-            }
-        }
-        // Then try props
-        if (propsBackgroundColors) {
-            return propsBackgroundColors;
-        }
-        // Fallback to window global
-        if (typeof window !== 'undefined' && window.__JHITS_PLUGIN_PROPS__) {
-            const pluginProps = window.__JHITS_PLUGIN_PROPS__['plugin-newsletter'];
-            if (pluginProps?.backgroundColors) {
-                return pluginProps.backgroundColors;
-            }
-        }
-        return undefined;
-    }, [propsBackgroundColors]);
+    const { subPath, siteId, locale } = props;
+    // Resolve configuration from multiple sources (Props, Window, Storage)
+    const config = useMemo(() => resolvePluginConfig(props), [props]);
+    const { customBlocks, darkMode, backgroundColors, translations, emailConfig, unsubscribeTranslations } = config;
     const route = subPath[0] || 'newsletters';
-    // Listen for config updates from settings screen
+    const newsletterId = subPath[1];
+    // Listen for config updates (e.g. from settings screen)
     useEffect(() => {
         if (typeof window === 'undefined')
             return;
@@ -120,8 +43,7 @@ export default function NewsletterPlugin(props) {
         case 'newsletters':
             return _jsx(NewsletterManagerView, { siteId: siteId, locale: locale });
         case 'editor':
-            const newsletterId = subPath[1];
-            return (_jsx(EditorProvider, { customBlocks: customBlocks, darkMode: darkMode, backgroundColors: backgroundColors, onSave: async (state, extraData) => {
+            return (_jsx(EditorProvider, { customBlocks: customBlocks, darkMode: darkMode, backgroundColors: backgroundColors, translations: translations, emailConfig: emailConfig, unsubscribeTranslations: unsubscribeTranslations, onSave: async (state, extraData) => {
                     // Save to API - create new or update existing newsletter
                     const originalId = newsletterId || state.slug;
                     const apiData = editorStateToAPI(state);
@@ -134,7 +56,6 @@ export default function NewsletterPlugin(props) {
                     const langParam = extraData?.language ? `?language=${extraData.language}` : '';
                     // If we have an id, try to update first
                     if (originalId) {
-                        console.log('[NewsletterPlugin] Attempting to update newsletter with id:', originalId);
                         const updateResponse = await fetch(`/api/plugin-newsletter/newsletters/${originalId}${langParam}`, {
                             method: 'PUT',
                             headers: { 'Content-Type': 'application/json' },
@@ -143,31 +64,14 @@ export default function NewsletterPlugin(props) {
                         });
                         if (updateResponse.ok) {
                             const result = await updateResponse.json();
-                            // If the id changed, update the URL
                             if (result.id && result.id !== originalId) {
                                 window.history.replaceState(null, '', `/dashboard/newsletter/editor/${result.id}`);
                             }
                             return result;
                         }
-                        // If 404, newsletter doesn't exist, create a new one
-                        if (updateResponse.status === 404) {
-                            console.log('[NewsletterPlugin] Newsletter not found, creating new newsletter');
-                        }
-                        else {
-                            // Other error, throw it
-                            const error = await updateResponse.json();
-                            console.error('[NewsletterPlugin] Save failed:', {
-                                status: updateResponse.status,
-                                statusText: updateResponse.statusText,
-                                error,
-                            });
-                            const errorMessage = error.message || error.error || 'Failed to save newsletter';
-                            throw new Error(errorMessage);
-                        }
                     }
-                    // Create new newsletter (either no id or update returned 404)
-                    console.log('[NewsletterPlugin] Creating new newsletter');
-                    const createResponse = await fetch('/api/plugin-newsletter/newsletters/new', {
+                    // Create new newsletter
+                    const createResponse = await fetch(`/api/plugin-newsletter/newsletters/new${langParam}`, {
                         method: 'POST',
                         headers: { 'Content-Type': 'application/json' },
                         credentials: 'include',
@@ -175,26 +79,18 @@ export default function NewsletterPlugin(props) {
                     });
                     if (!createResponse.ok) {
                         const error = await createResponse.json();
-                        console.error('[NewsletterPlugin] Create failed:', {
-                            status: createResponse.status,
-                            statusText: createResponse.statusText,
-                            error,
-                        });
                         const errorMessage = error.message || error.error || 'Failed to create newsletter';
                         throw new Error(errorMessage);
                     }
                     const result = await createResponse.json();
-                    // Update the URL to the new newsletter's id
                     if (result.id) {
                         window.history.replaceState(null, '', `/dashboard/newsletter/editor/${result.id}`);
                     }
                     return result;
                 }, children: _jsx(NewsletterEditorView, { newsletterId: newsletterId, siteId: siteId, locale: locale, darkMode: darkMode, backgroundColors: backgroundColors }) }));
         case 'new':
-            return (_jsx(EditorProvider, { customBlocks: customBlocks, darkMode: darkMode, backgroundColors: backgroundColors, onSave: async (state, extraData) => {
-                    // Save to API - create new newsletter
+            return (_jsx(EditorProvider, { customBlocks: customBlocks, darkMode: darkMode, backgroundColors: backgroundColors, translations: translations, emailConfig: emailConfig, unsubscribeTranslations: unsubscribeTranslations, onSave: async (state, extraData) => {
                     const apiData = editorStateToAPI(state);
-                    // Include language in metadata if provided
                     if (extraData?.language) {
                         apiData.metadata = apiData.metadata || {};
                         apiData.metadata.lang = extraData.language;
@@ -210,7 +106,6 @@ export default function NewsletterPlugin(props) {
                         throw new Error(error.message || 'Failed to create newsletter');
                     }
                     const result = await response.json();
-                    // Update the URL to the new newsletter's slug
                     if (result.slug) {
                         window.history.replaceState(null, '', `/dashboard/newsletter/editor/${result.slug}`);
                     }
@@ -219,7 +114,7 @@ export default function NewsletterPlugin(props) {
         case 'subscribers':
             return _jsx(SubscribersView, { siteId: siteId, locale: locale });
         case 'welcome':
-            return (_jsx(EditorProvider, { customBlocks: customBlocks, darkMode: darkMode, backgroundColors: backgroundColors, isWelcomeEmail: true, onSave: async (state, extraData) => {
+            return (_jsx(EditorProvider, { customBlocks: customBlocks, darkMode: darkMode, backgroundColors: backgroundColors, translations: translations, emailConfig: emailConfig, unsubscribeTranslations: unsubscribeTranslations, isWelcomeEmail: true, onSave: async (state, extraData) => {
                     const apiData = editorStateToAPI(state);
                     const language = extraData?.language || locale || 'en';
                     const response = await fetch(`/api/plugin-newsletter/welcome-email?language=${language}`, {
@@ -240,11 +135,9 @@ export default function NewsletterPlugin(props) {
             return _jsx(NewsletterManagerView, { siteId: siteId, locale: locale });
     }
 }
-// Export for use as default
+// Export symbols as needed
 export { NewsletterPlugin as Index };
-// Export initialization utility for easy setup
 export { initNewsletterPlugin } from './init';
-// Export editor state management
-export { EditorProvider, useEditor } from './state/EditorContext';
-// Export block registry
 export { blockRegistry } from './registry';
+export { EditorProvider, useEditor } from './state/EditorContext';
+export { BlockRenderer, BlocksRenderer } from './lib/blocks/BlockRenderer';

package/dist/lib/blocks/BlockRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BlockRenderer.d.ts","sourceRoot":"","sources":["../../../src/lib/blocks/BlockRenderer.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAI7D;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B,sBAAsB;IACtB,KAAK,EAAE,KAAK,CAAC;IAEb,oEAAoE;IACpE,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAEtE,uCAAuC;IACvC,OAAO,CAAC,EAAE;QACN,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KAC1B,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,EAC1B,KAAK,EACL,eAAe,EACf,OAAY,EACf,EAAE,kBAAkB,2CAoDpB;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,EAC3B,MAAM,EACN,eAAe,EACf,OAAY,EACf,EAAE;IACC,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACtE,OAAO,CAAC,EAAE;QACN,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KAC1B,CAAC;CACL,2CAaA"}
+{"version":3,"file":"BlockRenderer.d.ts","sourceRoot":"","sources":["../../../src/lib/blocks/BlockRenderer.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAK7D;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B,sBAAsB;IACtB,KAAK,EAAE,KAAK,CAAC;IAEb,oEAAoE;IACpE,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAEtE,uCAAuC;IACvC,OAAO,CAAC,EAAE;QACN,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KAC1B,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,EAC1B,KAAK,EACL,eAAe,EACf,OAAY,EACf,EAAE,kBAAkB,2CAiEpB;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,EAC3B,MAAM,EACN,eAAe,EACf,OAAY,EACf,EAAE;IACC,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACtE,OAAO,CAAC,EAAE;QACN,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KAC1B,CAAC;CACL,2CAaA"}

package/dist/lib/blocks/BlockRenderer.js

@@ -8,20 +8,32 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { blockRegistry } from '../../registry/BlockRegistry';
+import { useEditor } from '../../state/EditorContext';
 /**
  * Block Renderer Component
  * Renders a single block using its Preview component from the registry
  */
 export function BlockRenderer({ block, customRenderers, context = {} }) {
+    // We access the context to ensure re-render when blocks are registered
+    try {
+        useEditor();
+    }
+    catch (e) {
+        // Not in editor context (e.g. preview bridge)
+    }
     // Check for custom renderer override first
     if (customRenderers?.has(block.type)) {
         const CustomRenderer = customRenderers.get(block.type);
         return _jsx(CustomRenderer, { block: block, context: context });
     }
     // Get block definition from registry
-    const definition = blockRegistry.get(block.type);
+    let definition = blockRegistry.get(block.type);
+    // If not found, try one last immediate re-check of the global window registry
+    if (!definition && typeof window !== 'undefined' && window.__JHITS_NEWSLETTER_REGISTRY__) {
+        definition = window.__JHITS_NEWSLETTER_REGISTRY__.get(block.type);
+    }
     if (!definition) {
-        console.warn(`Block type "${block.type}" not found in registry. Available types:`, blockRegistry.getAll().map(b => b.type).join(', '));
+        console.warn(`[BlockRenderer] Unknown block type: ${block.type}. Registry contains:`, blockRegistry.getAll().map(b => b.type).join(', '));
         return (_jsxs("div", { className: "p-4 border border-red-300 bg-red-50 rounded", children: [_jsxs("p", { className: "text-red-600", children: ["Unknown block type: ", block.type] }), _jsx("p", { className: "text-xs text-red-500 mt-1", children: "Make sure this block type is registered via customBlocks prop" })] }));
     }
     // Use the Preview component from the block definition

package/dist/lib/email/EmailRenderer.d.ts

@@ -39,6 +39,7 @@ export declare function generateNewsletterEmailHtml(blocks: Block[], metadata: {
     previewText?: string;
 }, context: EmailRenderContext & {
     unsubscribeUrl?: string;
+    unsubscribeText?: string;
     footerText?: string;
     logoUrl?: string;
     logoAlt?: string;

package/dist/lib/email/EmailRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EmailRenderer.d.ts","sourceRoot":"","sources":["../../../src/lib/email/EmailRenderer.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAI1C;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,GAAE,kBAAuB,GAAG,MAAM,CAmBzF;AA0OD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,OAAO,GAAE,kBAAuB,GAAG,MAAM,CAE7F;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACvC,MAAM,EAAE,KAAK,EAAE,EACf,QAAQ,EAAE;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,EACD,OAAO,EAAE,kBAAkB,GAAG;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,GACF,MAAM,CA8GR"}
+{"version":3,"file":"EmailRenderer.d.ts","sourceRoot":"","sources":["../../../src/lib/email/EmailRenderer.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C;;GAEG;AACH,MAAM,WAAW,kBAAkB;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,GAAE,kBAAuB,GAAG,MAAM,CAmBzF;AAoPD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,OAAO,GAAE,kBAAuB,GAAG,MAAM,CAE7F;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACvC,MAAM,EAAE,KAAK,EAAE,EACf,QAAQ,EAAE;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,EACD,OAAO,EAAE,kBAAkB,GAAG;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,GACF,MAAM,CA+GR"}