@stackedapp/utils 1.17.3 → 1.17.4

package/dist/conditions.js

@@ -16,6 +16,7 @@ const calculatePercent = (amount, goal, isMet) => {
     }
     return isMet ? 100 : 0;
 };
+const formatList = (items) => items.length === 2 ? items.join(' and ') : `${items.slice(0, -1).join(', ')}, and ${items.at(-1)}`;
 const calculateDynamicConditionPercent = (dynamicObj, cond) => {
     if (!dynamicObj)
         return 0;
@@ -451,7 +452,7 @@ additionalData, }) => {
         }
     }
     // Validate link count conditions
-    if (conditions?.links && 'entityLinks' in playerSnap) {
+    if (conditions?.links) {
         for (const [linkType, constraint] of Object.entries(conditions.links)) {
             // linkType should always exist. and be default is none was specified
             const linkCount = playerSnap.entityLinks?.filter((link) => (link.kind || exports.DEFAULT_ENTITY_KIND) === linkType).length || 0;
@@ -553,19 +554,30 @@ additionalData, }) => {
                 return { isValid: false, isComplete: false, percentCompleted: 0 };
         }
     }
-    if (conditions?.identifiers?.platforms?.length && 'identifiers' in playerSnap) {
+    if (conditions?.identifiers?.platforms?.length) {
         const playerPlatforms = new Set(playerSnap.identifiers?.map((i) => i.platform.toLowerCase()) || []);
         const isAndBehaviour = conditions.identifiers.behaviour === 'AND';
         const platformsToCheck = conditions.identifiers.platforms;
         let isMet;
         let displayText;
+        const platformsMap = {
+            sms: 'SMS',
+            email: 'Email',
+            apple: 'Apple',
+            google: 'Google',
+            tiktok: 'TikTok',
+        };
+        const metAndPlatforms = platformsToCheck.filter((platform) => playerPlatforms.has(platform.toLowerCase()));
         if (isAndBehaviour) {
-            isMet = platformsToCheck.every((platform) => playerPlatforms.has(platform.toLowerCase()));
-            displayText = `Link all: ${platformsToCheck.join(', ')}`;
+            isMet = metAndPlatforms.length === platformsToCheck.length;
+            displayText =
+                platformsToCheck.length > 1
+                    ? `Link your ${formatList(platformsToCheck.map((p) => platformsMap[p.toLowerCase()] ?? p))} accounts`
+                    : `Link your ${platformsMap[platformsToCheck[0].toLowerCase()] ?? platformsToCheck[0]} account`;
         }
         else {
             isMet = platformsToCheck.some((platform) => playerPlatforms.has(platform.toLowerCase()));
-            displayText = `Link any: ${platformsToCheck.join(', ')}`;
+            displayText = `Link any of your ${formatList(platformsToCheck.map((p) => platformsMap[p.toLowerCase()] ?? p))} accounts`;
         }
         if (addDetails) {
             conditionData.push({
@@ -573,7 +585,11 @@ additionalData, }) => {
                 kind: 'identifiers',
                 trackerAmount: isMet ? 1 : 0,
                 trackerGoal: 1,
-                percentCompleted: isMet ? 100 : 0, // Binary
+                percentCompleted: isAndBehaviour
+                    ? calculatePercent(metAndPlatforms.length, platformsToCheck.length, isMet)
+                    : isMet
+                        ? 100
+                        : 0,
                 text: displayText,
             });
             if (!isMet)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackedapp/utils",
-  "version": "1.17.3",
+  "version": "1.17.4",
   "description": "Public utilities for Stacked platform SDK",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",