@capillarytech/creatives-library 8.0.329 → 8.0.330-alpha.1

package/constants/unified.js

@@ -168,6 +168,10 @@ export const COMBINED_SMS_TEMPLATE_VAR_REGEX = /\{\{[^}]+\}\}|\{\#[^#]*\#\}/g;
 export const MUSTACHE_VAR_TOKEN_FULL_STRING_REGEX = /^\{\{[^}]+\}\}$/;
 /** Full-string check: one DLT hash token. */
 export const DLT_HASH_VAR_TOKEN_FULL_STRING_REGEX = /^\{\#[^#]*\#\}$/;
+/** Full-string with capture group: inner name for `{{ name }}`-style tokens (whitespace-tolerant). */
+export const MUSTACHE_TOKEN_INNER_NAME_REGEX = /^\{\{\s*([^}]+?)\s*\}\}$/;
+/** Full-string with capture group: inner name/body for `{# name #}` DLT tokens (whitespace-tolerant). */
+export const DLT_HASH_TOKEN_INNER_NAME_REGEX = /^\{#\s*(.*?)\s*#\}$/;
 /** Global with capture group: inner name inside `{{name}}`. */
 export const MUSTACHE_VAR_NAME_CAPTURE_REGEX = /\{\{([^}]+)\}\}/g;
 /** Global with capture group: inner body inside `{#body#}`. */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "8.0.329",
+  "version": "8.0.330-alpha.1",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/utils/commonUtils.js

@@ -539,4 +539,22 @@ export const isValidMobile = (mobile) => PHONE_REGEX.test(mobile);
 export const formatPhoneNumber = (phone) => {
   if (!phone) return '';
   return String(phone).replace(/[^\d]/g, '');
-};
+};
+
+/**
+ * TRAI sender IDs on persisted RCS SMS fallback: may live on the merged object, under
+ * `templateConfigs`, or (legacy) `templateConfigs.header`. Same resolution order as
+ * `createPayload` in `Rcs/index.js`.
+ */
+export function extractRegisteredSenderIdsFromSmsFallbackRecord(record) {
+  if (!record || typeof record !== 'object') return null;
+  const tc = record.templateConfigs && typeof record.templateConfigs === 'object'
+    ? record.templateConfigs
+    : {};
+  const candidates = [record.registeredSenderIds, tc.registeredSenderIds, tc.header];
+  for (let i = 0; i < candidates.length; i += 1) {
+    const a = candidates[i];
+    if (Array.isArray(a) && a.length > 0) return a;
+  }
+  return null;
+}

package/utils/templateVarUtils.js

@@ -7,7 +7,9 @@ import {
   COMBINED_SMS_TEMPLATE_VAR_REGEX,
   DEFAULT_MUSTACHE_VAR_REGEX,
   DLT_HASH_VAR_TOKEN_FULL_STRING_REGEX,
+  DLT_HASH_TOKEN_INNER_NAME_REGEX,
   DLT_VAR_BODY_CAPTURE_REGEX,
+  MUSTACHE_TOKEN_INNER_NAME_REGEX,
   MUSTACHE_VAR_NAME_CAPTURE_REGEX,
   MUSTACHE_VAR_TOKEN_FULL_STRING_REGEX,
 } from '../constants/unified';
@@ -115,13 +117,36 @@ export const extractTemplateVariables = (templateStr = '', captureRegex) => {
   return variables;
 };
 
+/**
+ * Looks up the inner name of a `{{name}}` or `{#name#}` token in a flat key→value map.
+ * Handles both exact matches and dot-path suffixes (e.g. `tag.FORMAT_1` → name `FORMAT_1`).
+ * Returns the resolved string value, or `undefined` if not found / blank.
+ */
+function resolveUserVarForToken(segment, userVarMap) {
+  if (!userVarMap || typeof userVarMap !== 'object') return undefined;
+  const mMustache = segment.match(MUSTACHE_TOKEN_INNER_NAME_REGEX);
+  const mDlt = segment.match(DLT_HASH_TOKEN_INNER_NAME_REGEX);
+  const innerName = ((mMustache ? mMustache[1] : (mDlt ? mDlt[1] : '')) ?? '').trim();
+  if (!innerName) return undefined;
+  const direct = userVarMap[innerName];
+  if (direct != null && String(direct).trim() !== '') return String(direct);
+  const hit = Object.keys(userVarMap).find((k) => k === innerName || k.endsWith(`.${innerName}`));
+  if (hit != null && userVarMap[hit] != null && String(userVarMap[hit]).trim() !== '') return String(userVarMap[hit]);
+  return undefined;
+}
+
 /**
  * SMS / DLT template preview: replace `{{…}}` / `{#…#}` tokens using `varMapData` keys `${token}_${index}`.
  * Used by SmsTraiEdit (RCS SMS fallback) and UnifiedPreview fallback SMS bubble.
  * DLT `{#…#}`: empty / unset slot values show the raw token (matches DLT preview UX); mustache `{{…}}` still
  * resolves to empty when the slot is cleared.
+ *
+ * @param {string} templateStr
+ * @param {Object} varMapData - Slot map (`${token}_${index}` → value)
+ * @param {Object|null} [userVarMap] - Optional Test & Preview custom values; used as fallback when a slot
+ *   is absent or blank. When omitted the function behaves identically to its original two-argument form.
  */
-export const getFallbackResolvedContent = (templateStr = '', varMapData = {}) => {
+export const getFallbackResolvedContent = (templateStr = '', varMapData = {}, userVarMap = null) => {
   const fallbackVarSlotMap = varMapData ?? {};
   const templateSegments = splitTemplateVarString(templateStr, COMBINED_SMS_TEMPLATE_VAR_REGEX);
   return templateSegments
@@ -132,13 +157,17 @@ export const getFallbackResolvedContent = (templateStr = '', varMapData = {}) =>
       if (Object.prototype.hasOwnProperty.call(fallbackVarSlotMap, slotKey)) {
         const slotValue = fallbackVarSlotMap[slotKey];
         if (isDltHashVarToken(segment)) {
-          if (slotValue == null) return segment;
-          const str = String(slotValue);
-          if (str.trim() === '') return segment;
-          return str;
+          if (slotValue == null || String(slotValue).trim() === '') {
+            if (userVarMap) { const uv = resolveUserVarForToken(segment, userVarMap); if (uv !== undefined) return uv; }
+            return segment;
+          }
+          return String(slotValue);
         }
-        return slotValue == null ? '' : String(slotValue);
+        if (slotValue != null && String(slotValue).trim() !== '') return String(slotValue);
+        if (userVarMap) { const uv = resolveUserVarForToken(segment, userVarMap); if (uv !== undefined) return uv; }
+        return '';
       }
+      if (userVarMap) { const uv = resolveUserVarForToken(segment, userVarMap); if (uv !== undefined) return uv; }
       if (isDltHashVarToken(segment)) return segment;
       return '';
     })

package/utils/tests/tagValidations.test.js

@@ -360,6 +360,26 @@ describe("validateTags", () => {
     expect(resultWhitespace.valid).toBe(true);
     expect(resultWhitespace.unsupportedTags ?? []).toEqual([]);
   });
+
+  it('should treat tags from waitEventContextTags as supported', () => {
+    const content = 'Hello {{waitEvent.orderId}}';
+    const tagsParam = [];
+    const injectedTagsParams = [];
+    const location = { query: { module: 'DEFAULT' } };
+    const tagModule = null;
+
+    const result = validateTags({
+      content,
+      tagsParam,
+      injectedTagsParams,
+      location,
+      tagModule,
+    });
+
+    expect(result.valid).toEqual(true);
+    expect(result.missingTags).toEqual([]);
+    expect(result.isBraceError).toEqual(false);
+  });
 });
 
 describe('validateTags wrapper (v2 consumers)', () => {

package/utils/tests/templateVarUtils.test.js

@@ -157,4 +157,48 @@ describe('templateVarUtils', () => {
       expect(extractTemplateVariables('{{x}} {{y}}', globalRe)).toEqual(['x', 'y']);
     });
   });
+
+  describe('getFallbackResolvedContent — userVarMap (third param)', () => {
+    it('falls back to userVarMap for mustache slot absent from varMapData', () => {
+      expect(getFallbackResolvedContent('Hi {{name}}', {}, { name: 'Alice' })).toBe('Hi Alice');
+    });
+
+    it('falls back to userVarMap for DLT slot absent from varMapData', () => {
+      expect(getFallbackResolvedContent('{#city#}', {}, { city: 'Mumbai' })).toBe('Mumbai');
+    });
+
+    it('falls back to userVarMap when mustache slot is present but blank', () => {
+      expect(getFallbackResolvedContent('{{x}}', { '{{x}}_0': '' }, { x: 'val' })).toBe('val');
+    });
+
+    it('falls back to userVarMap when DLT slot is present but blank', () => {
+      expect(getFallbackResolvedContent('{#x#}', { '{#x#}_0': '' }, { x: 'val' })).toBe('val');
+    });
+
+    it('slot wins over userVarMap when mustache slot is non-empty', () => {
+      expect(getFallbackResolvedContent('{{x}}', { '{{x}}_0': 'slot-val' }, { x: 'user-val' })).toBe('slot-val');
+    });
+
+    it('slot wins over userVarMap when DLT slot is non-empty', () => {
+      expect(getFallbackResolvedContent('{#x#}', { '{#x#}_0': 'slot' }, { x: 'user' })).toBe('slot');
+    });
+
+    it('resolves dot-path suffix key from userVarMap', () => {
+      expect(
+        getFallbackResolvedContent('{{FORMAT_1}}', {}, { 'expiry.FORMAT_1': 'Dec 2025' }),
+      ).toBe('Dec 2025');
+    });
+
+    it('userVarMap null behaves identically to the two-argument form', () => {
+      expect(getFallbackResolvedContent('{{a}}', { '{{a}}_0': 'x' }, null)).toBe('x');
+    });
+
+    it('blank userVarMap value leaves mustache token as empty string', () => {
+      expect(getFallbackResolvedContent('{{a}}', {}, { a: '' })).toBe('');
+    });
+
+    it('blank userVarMap value leaves DLT token as raw token', () => {
+      expect(getFallbackResolvedContent('{#a#}', {}, { a: '' })).toBe('{#a#}');
+    });
+  });
 });

package/v2Components/CapActionButton/constants.js

@@ -32,6 +32,13 @@ export const CTA_OPTIONS = [
 ];
 
 export const invalidVarRegex = /{{(.*?)}}/g;
+
+/** URL CTA subtype (Figma: URL type dropdown). */
+export const RCS_CTA_URL_TYPE = {
+  STATIC: 'STATIC',
+  DYNAMIC: 'DYNAMIC',
+};
+
 export const BTN_MAX_LENGTH = 25;
 export const PHONE_NUMBER_MAX_LENGTH = 15;
 export const URL_MAX_LENGTH = 2000;