@dappermountain/payload-plugin-achievements 0.2.13 → 0.2.15

package/dist/services/achievement/tierProgression.d.ts

@@ -1,4 +1,9 @@
 import type { PayloadRequest } from 'payload';
+/**
+ * Ensure a tier request exists when unlock rules pass.
+ * Prefer open (pending/approved) rows. If only a **rejected** request exists,
+ * leave it alone — do not auto-queue a new pending after a denial.
+ */
 export declare function ensureTierRequest(args: {
     req: PayloadRequest;
     userId: string;
@@ -9,7 +14,8 @@ export declare function ensureTierRequest(args: {
     created: boolean;
 }>;
 /**
- * When unlock rules pass and the tier requires review, ensure a pending/approved request exists.
+ * When unlock rules pass and the tier requires review, ensure a request exists.
+ * Does not recreate a request after rejection — reopen by updating that row or creating manually.
  */
 export declare function syncTierProgression(args: {
     req: PayloadRequest;

package/dist/services/achievement/tierProgression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tierProgression.d.ts","sourceRoot":"","sources":["../../../src/services/achievement/tierProgression.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,SAAS,CAAA;AAgBpD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CACvB,GAAG,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAsC9D;AAED;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CACvB,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CA0DjC;AAED,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA"}
+{"version":3,"file":"tierProgression.d.ts","sourceRoot":"","sources":["../../../src/services/achievement/tierProgression.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,SAAS,CAAA;AAqBpD;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CACvB,GAAG,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAqD9D;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CACvB,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CA0DjC;AAED,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA"}

package/dist/services/achievement/tierProgression.js

@@ -2,26 +2,48 @@ import { collectionOf } from '../../collections/helpers.js';
 import { CTX_SYSTEM_REQUEST } from './contextFlags.js';
 import { evaluateRules } from './evaluateRules.js';
 import { hasApprovedTierRequest } from './tierApproval.js';
+function tierRequestScopeClauses(scopeId) {
+    if (scopeId)
+        return [{ scope: { equals: scopeId } }];
+    return [{ scope: { exists: false } }];
+}
+/**
+ * Ensure a tier request exists when unlock rules pass.
+ * Prefer open (pending/approved) rows. If only a **rejected** request exists,
+ * leave it alone — do not auto-queue a new pending after a denial.
+ */
 export async function ensureTierRequest(args) {
-    const clauses = [
+    const base = [
         { user: { equals: args.userId } },
         { tier: { equals: args.tierId } },
-        { status: { in: ['pending', 'approved'] } },
+        ...tierRequestScopeClauses(args.scopeId),
     ];
-    if (args.scopeId)
-        clauses.push({ scope: { equals: args.scopeId } });
-    else
-        clauses.push({ scope: { exists: false } });
-    const existing = await args.req.payload.find({
+    const open = await args.req.payload.find({
+        collection: collectionOf('tierRequests'),
+        depth: 0,
+        limit: 1,
+        overrideAccess: true,
+        req: args.req,
+        where: {
+            and: [...base, { status: { in: ['pending', 'approved'] } }],
+        },
+    });
+    if (open.docs[0]) {
+        return { doc: open.docs[0], created: false };
+    }
+    const rejected = await args.req.payload.find({
         collection: collectionOf('tierRequests'),
         depth: 0,
         limit: 1,
         overrideAccess: true,
         req: args.req,
-        where: { and: clauses },
+        sort: '-updatedAt',
+        where: {
+            and: [...base, { status: { equals: 'rejected' } }],
+        },
     });
-    if (existing.docs[0]) {
-        return { doc: existing.docs[0], created: false };
+    if (rejected.docs[0]) {
+        return { doc: rejected.docs[0], created: false };
     }
     args.req.context[CTX_SYSTEM_REQUEST] = true;
     try {
@@ -43,7 +65,8 @@ export async function ensureTierRequest(args) {
     }
 }
 /**
- * When unlock rules pass and the tier requires review, ensure a pending/approved request exists.
+ * When unlock rules pass and the tier requires review, ensure a request exists.
+ * Does not recreate a request after rejection — reopen by updating that row or creating manually.
  */
 export async function syncTierProgression(args) {
     const scopeId = args.scopeId;

package/dist/services/achievement/validateRules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validateRules.d.ts","sourceRoot":"","sources":["../../../src/services/achievement/validateRules.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAEvE;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,IAAI,CA0E7E;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,IAAI,GAAG,SAAS,GAC9D,MAAM,GAAG,IAAI,CAOf;AAED,+EAA+E;AAC/E,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,IAAI,GAAG,SAAS,EAC/D,KAAK,EAAE,MAAM,GACZ,IAAI,CAKN"}
+{"version":3,"file":"validateRules.d.ts","sourceRoot":"","sources":["../../../src/services/achievement/validateRules.ts"],"names":[],"mappings":"AAKA,OAAO,EAAsB,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAEvE;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,IAAI,CA2E7E;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,IAAI,GAAG,SAAS,GAC9D,MAAM,GAAG,IAAI,CAOf;AAED,+EAA+E;AAC/E,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,IAAI,GAAG,SAAS,EAC/D,KAAK,EAAE,MAAM,GACZ,IAAI,CAKN"}

package/dist/services/achievement/validateRules.js

@@ -1,4 +1,6 @@
 import { APIError } from 'payload';
+import { isBuiltinElapsedSince } from '../../extensions/elapsedSinceOptions.js';
+import { getMetricAnchorResolver } from '../../extensions/metricAnchors.js';
 import { relationId } from './relationId.js';
 import { normalizeRuleGroup } from './evaluateRules.js';
 /**
@@ -56,7 +58,8 @@ export function validateRuleNode(rule) {
                 return 'Elapsed since (first event) needs an event type.';
             }
         }
-        else if (since !== 'user-created-at') {
+        else if (!isBuiltinElapsedSince(since) && !getMetricAnchorResolver(since)) {
+            // Host anchors (e.g. membership-granted) are registered via extensions.metricAnchors.
             return 'Elapsed since needs a valid since source.';
         }
         if (typeof rule.amount !== 'number' || Number.isNaN(rule.amount) || rule.amount < 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dappermountain/payload-plugin-achievements",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "description": "A robust, Admin-configured achievements engine for Payload: composable unlock rules, derived rank progress, request/review grants, metrics, and scoped multi-tenant support.",
   "license": "MIT",
   "type": "module",