@stackedapp/utils 2.0.0 → 2.1.0

package/dist/conditions/helpers.js

@@ -48,9 +48,14 @@ const calculateDynamicGroupPercent = (dynamicObj, group) => {
     if (!group?.conditions?.length)
         return 100;
     const percentages = group.conditions.map((c) => (0, exports.calculateDynamicConditionPercent)(dynamicObj, c));
-    if (!group.links?.length) {
+    if (!group.links?.length || group.links.every((l) => l === 'AND')) {
         return percentages.reduce((sum, p) => sum + p, 0) / percentages.length;
     }
+    if (group.links.every((l) => l === 'AND NOT')) {
+        const adjusted = [percentages[0], ...percentages.slice(1).map((p) => 100 - p)];
+        return adjusted.reduce((sum, p) => sum + p, 0) / adjusted.length;
+    }
+    // Mixed links: fall back to pairwise evaluation
     let result = percentages[0];
     for (let i = 0; i < group.links.length; i++) {
         const nextPct = percentages[i + 1];

package/dist/conditions/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.meetsCompletionConditionsBeforeExpiry = exports.meetsCompletionConditions = exports.offerMeetsCompletionConditions = exports.meetsLinkedEntityOffersCondition = exports.hasCompletionConditions = exports.meetsBaseConditions = exports.getMaxClaimsForDynamicGroup = exports.getMaxClaimsForDynamicCondition = exports.meetsDynamicConditions = void 0;
 exports.meetsClaimableConditions = meetsClaimableConditions;
 const handlers_1 = require("./handlers");
+const template_1 = require("../template");
 var helpers_1 = require("./helpers");
 Object.defineProperty(exports, "meetsDynamicConditions", { enumerable: true, get: function () { return helpers_1.meetsDynamicConditions; } });
 Object.defineProperty(exports, "getMaxClaimsForDynamicCondition", { enumerable: true, get: function () { return helpers_1.getMaxClaimsForDynamicCondition; } });
@@ -76,8 +77,51 @@ const meetsBaseConditions = ({ conditions, playerSnap, addDetails, playerOffer,
         shouldScale: false,
     };
     for (const cond of conditions) {
-        if (cond.kind === 'nested')
-            continue; // handled separately if needed
+        if (cond.kind === 'nested') {
+            const nested = cond;
+            const evalNested = (conds) => (0, exports.meetsBaseConditions)({ conditions: conds, playerSnap, addDetails, playerOffer, additionalData });
+            let nestedMet = false;
+            let nestedPercent = 0;
+            let children;
+            if (nested.operator === 'AND') {
+                const result = evalNested(nested.conditions);
+                nestedMet = result.isValid;
+                nestedPercent = result.percentCompleted;
+                children = result.conditionData;
+            }
+            else if (nested.operator === 'OR') {
+                let bestPercent = 0;
+                const allChildren = [];
+                for (const child of nested.conditions) {
+                    const result = evalNested([child]);
+                    if (result.isValid)
+                        nestedMet = true;
+                    bestPercent = Math.max(bestPercent, result.percentCompleted);
+                    if (result.conditionData)
+                        allChildren.push(...result.conditionData);
+                }
+                nestedPercent = nestedMet ? 100 : bestPercent;
+                children = allChildren.length > 0 ? allChildren : undefined;
+            }
+            else if (nested.operator === 'NOT') {
+                const result = evalNested(nested.conditions);
+                nestedMet = !result.isValid;
+                nestedPercent = nestedMet ? 100 : 0;
+                children = result.conditionData;
+            }
+            if (addDetails) {
+                const text = nested.template && children?.length
+                    ? (0, template_1.renderNestedTemplate)(nested.template, children)
+                    : children?.map((c) => c.text).join(` ${nested.operator} `) || nested.operator;
+                conditionData.push({ isMet: nestedMet, kind: 'nested', percentCompleted: nestedPercent, text, operator: nested.operator, children });
+                if (!nestedMet)
+                    isValid = false;
+            }
+            else if (!nestedMet) {
+                return { isValid: false, isComplete: false, percentCompleted: 0 };
+            }
+            continue;
+        }
         const result = evaluateBaseCondition(cond, ctx);
         if (!result)
             continue; // not a base kind, skip
@@ -156,8 +200,54 @@ const meetsCompletionConditions = ({ completionConditions, completionTrackers, p
         offerCreatedAt: playerOffer?.createdAt,
     };
     for (const cond of completionConditions) {
-        if (cond.kind === 'nested')
-            continue; // TODO: handle nested
+        if (cond.kind === 'nested') {
+            const nested = cond;
+            const evalNested = (conds) => (0, exports.meetsCompletionConditions)({
+                completionConditions: conds, completionTrackers, playerSnap, playerOffer,
+                addDetails, maxClaimCount, additionalData,
+            });
+            let nestedMet = false;
+            let nestedPercent = 0;
+            let children;
+            if (nested.operator === 'AND') {
+                const result = evalNested(nested.conditions);
+                nestedMet = result.isValid;
+                nestedPercent = result.percentCompleted;
+                children = result.conditionData?.length ? result.conditionData : undefined;
+            }
+            else if (nested.operator === 'OR') {
+                let bestPercent = 0;
+                const allChildren = [];
+                for (const child of nested.conditions) {
+                    const result = evalNested([child]);
+                    if (result.isValid)
+                        nestedMet = true;
+                    bestPercent = Math.max(bestPercent, result.percentCompleted);
+                    if (result.conditionData)
+                        allChildren.push(...result.conditionData);
+                }
+                nestedPercent = nestedMet ? 100 : bestPercent;
+                children = allChildren.length > 0 ? allChildren : undefined;
+            }
+            else if (nested.operator === 'NOT') {
+                const result = evalNested(nested.conditions);
+                nestedMet = !result.isValid;
+                nestedPercent = nestedMet ? 100 : 0;
+                children = result.conditionData?.length ? result.conditionData : undefined;
+            }
+            if (addDetails) {
+                const text = nested.template && children?.length
+                    ? (0, template_1.renderNestedTemplate)(nested.template, children)
+                    : children?.map((c) => c.text).join(` ${nested.operator} `) || nested.operator;
+                conditionData.push({ isMet: nestedMet, kind: 'nested', percentCompleted: nestedPercent, text, operator: nested.operator, children });
+                if (!nestedMet)
+                    isValid = false;
+            }
+            else if (!nestedMet) {
+                return { isValid: false, isComplete: false, percentCompleted: 0, availableClaimsNow: 0 };
+            }
+            continue;
+        }
         // Try completion-only handler first, then base handler
         let result = evaluateCompletionOnlyCondition(cond, ctx);
         if (!result)
@@ -308,6 +398,19 @@ const meetsCompletionConditionsBeforeExpiry = ({ completionConditions, completio
                     }
                 }
                 break;
+            case 'nested': {
+                const nested = cond;
+                const childResult = (0, exports.meetsCompletionConditionsBeforeExpiry)({
+                    completionConditions: nested.conditions,
+                    completionTrackers,
+                    playerSnap,
+                    playerOffer,
+                    maxClaimCount,
+                });
+                if (!childResult)
+                    return false;
+                break;
+            }
         }
     }
     return true;

package/dist/template.d.ts

@@ -1,4 +1,4 @@
-import { IDynamicCondition } from '@stackedapp/types';
+import { IDynamicCondition, ConditionDetail } from '@stackedapp/types';
 export declare function extractTemplateKeys(template: string | undefined): Set<string>;
 /**
  * This replaces {keyName} keys from the template with corresponding values from the dynamic object.
@@ -11,6 +11,12 @@ export declare function renderTemplate(template: string | undefined, dynamic: Re
  * eg. a condition high_score_pet-{{surfacerPlayerId}} with high_score_pet-12345
  */
 export declare function replaceDynamicConditionKey(key: string, trackers: Record<string, any> | undefined): string;
+/**
+ * Renders a nested condition template using children's data.
+ * Supports {[0].text}, {[0].current}, {[0].goal}, {[0].percent}, {[0].met}
+ * where current = trackerAmount, goal = trackerGoal, percent = percentCompleted, met = isMet
+ */
+export declare function renderNestedTemplate(template: string, children: ConditionDetail[]): string;
 /** this replaces all of the dynamic conditions.keys by calling replaceDynamicConditionKey */
 export declare function replaceDynamicConditionKeys(conditions: Array<IDynamicCondition>, trackers: Record<string, any> | undefined): {
     key: string;

package/dist/template.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractTemplateKeys = extractTemplateKeys;
 exports.renderTemplate = renderTemplate;
 exports.replaceDynamicConditionKey = replaceDynamicConditionKey;
+exports.renderNestedTemplate = renderNestedTemplate;
 exports.replaceDynamicConditionKeys = replaceDynamicConditionKeys;
 const keyPattern = /\{([a-zA-Z_][a-zA-Z0-9_-]*)\}/g;
 // extract {key} placeholders from template string
@@ -48,6 +49,28 @@ function replaceDynamicConditionKey(key, trackers) {
         return value !== undefined ? String(value) : match;
     });
 }
+const nestedKeyPattern = /\{(\[(\d+)\])\.([a-zA-Z_][a-zA-Z0-9_]*)\}/g;
+/**
+ * Renders a nested condition template using children's data.
+ * Supports {[0].text}, {[0].current}, {[0].goal}, {[0].percent}, {[0].met}
+ * where current = trackerAmount, goal = trackerGoal, percent = percentCompleted, met = isMet
+ */
+function renderNestedTemplate(template, children) {
+    return template.replace(nestedKeyPattern, (_match, _bracket, index, field) => {
+        const child = children[Number(index)];
+        if (!child)
+            return '{?}';
+        switch (field) {
+            case 'text': return child.text;
+            case 'current': return String(child.trackerAmount ?? 0);
+            case 'goal': return String(child.trackerGoal ?? 0);
+            case 'percent': return String(Math.round(child.percentCompleted));
+            case 'met': return child.isMet ? '✓' : '✗';
+            case 'kind': return child.kind || '';
+            default: return '{?}';
+        }
+    });
+}
 /** this replaces all of the dynamic conditions.keys by calling replaceDynamicConditionKey */
 function replaceDynamicConditionKeys(conditions, trackers) {
     return conditions.map((condition) => ({

package/package.json

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