@dappermountain/payload-plugin-achievements 0.3.0 → 0.4.0

package/dist/defaults.js

@@ -3,6 +3,20 @@ export const DEFAULT_USERS_COLLECTION = 'users';
 export const DEFAULT_ME_ENDPOINT_PATH = '/achievements/me';
 export const DEFAULT_LEADERBOARD_ENDPOINT_PATH = '/achievements/leaderboard';
 export const DEFAULT_RECONCILE_ENDPOINT_PATH = '/achievements/reconcile';
+/** Unique, non-empty collection slugs from plugin `subjects.collections`. */
+export function resolveSubjectCollections(options) {
+    const raw = options?.subjects?.collections ?? [];
+    const seen = new Set();
+    const out = [];
+    for (const slug of raw) {
+        const trimmed = typeof slug === 'string' ? slug.trim() : '';
+        if (!trimmed || seen.has(trimmed))
+            continue;
+        seen.add(trimmed);
+        out.push(trimmed);
+    }
+    return out;
+}
 function normalizeEndpointPath(path, fallback) {
     const trimmed = path.trim();
     if (!trimmed)
@@ -31,14 +45,16 @@ export function resolveReconcileEndpointPath(path) {
     return normalizeEndpointPath(path, DEFAULT_RECONCILE_ENDPOINT_PATH);
 }
 export function resolveOptions(options = {}) {
+    const { subjects: _subjects, ...rest } = options;
     return {
-        ...options,
+        ...rest,
         enabled: options.enabled !== false,
         seedSystemCatalog: options.seedSystemCatalog !== false,
         usersCollectionSlug: options.usersCollectionSlug ?? DEFAULT_USERS_COLLECTION,
         users: {
             includeJoins: options.users?.includeJoins !== false,
         },
+        subjectCollections: resolveSubjectCollections(options),
         collectionSlugs: resolveCollectionSlugs(options),
         adminGroup: resolveAdminGroup(options),
         endpoints: {

package/dist/endpoints/me.d.ts

@@ -1,7 +1,8 @@
 import type { Endpoint } from 'payload';
 /**
  * `GET` current user’s snapshot. Body is Payload `find`-shaped for **grants**,
- * plus ladder-derived `tiers` and lean `requests`. Optional `?scope=` / `limit` / `page`.
+ * plus ladder-derived `tiers` and lean `requests`. Optional `?scope=` / `limit` / `page`
+ * / `reviews=1` (pending achievement keys + open/rejected tier requests).
  */
 export declare function buildMeEndpoint(path: string): Endpoint;
 //# sourceMappingURL=me.d.ts.map

package/dist/endpoints/me.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"me.d.ts","sourceRoot":"","sources":["../../src/endpoints/me.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,SAAS,CAAA;AA+BvD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAqBtD"}
+{"version":3,"file":"me.d.ts","sourceRoot":"","sources":["../../src/endpoints/me.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,SAAS,CAAA;AAoCvD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAsBtD"}

package/dist/endpoints/me.js

@@ -24,9 +24,14 @@ function pagingFromRequest(req) {
         requestsLimit: positiveInt(params?.get('requestsLimit') ?? null, 20),
     };
 }
+function reviewsFromRequest(req) {
+    const raw = requestUrl(req)?.searchParams.get('reviews');
+    return raw === '1' || raw === 'true';
+}
 /**
  * `GET` current user’s snapshot. Body is Payload `find`-shaped for **grants**,
- * plus ladder-derived `tiers` and lean `requests`. Optional `?scope=` / `limit` / `page`.
+ * plus ladder-derived `tiers` and lean `requests`. Optional `?scope=` / `limit` / `page`
+ * / `reviews=1` (pending achievement keys + open/rejected tier requests).
  */
 export function buildMeEndpoint(path) {
     return {
@@ -43,6 +48,7 @@ export function buildMeEndpoint(path) {
                 userId,
                 scopeId: scopeFromRequest(req),
                 paging: pagingFromRequest(req),
+                include: reviewsFromRequest(req) ? { reviews: true } : undefined,
             });
             return Response.json(body);
         },

package/dist/exports/client.d.ts

@@ -3,4 +3,5 @@ export { LucideIconField } from '../admin/LucideIconField.js';
 export { MetricChangeField } from '../admin/MetricChangeField.js';
 export { MetricField } from '../admin/MetricField.js';
 export { ReconcileProgressionButton } from '../admin/ReconcileProgressionButton.js';
+export { SubjectField } from '../admin/SubjectField.js';
 //# sourceMappingURL=client.d.ts.map

package/dist/exports/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAA;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA"}

package/dist/exports/client.js

@@ -3,3 +3,4 @@ export { LucideIconField } from '../admin/LucideIconField.js';
 export { MetricChangeField } from '../admin/MetricChangeField.js';
 export { MetricField } from '../admin/MetricField.js';
 export { ReconcileProgressionButton } from '../admin/ReconcileProgressionButton.js';
+export { SubjectField } from '../admin/SubjectField.js';

package/dist/index.d.ts

@@ -3,12 +3,13 @@ export type { EngineEventTypeSlug, EngineMetricSlug } from './catalog.js';
 export { achievementPlugin } from './plugin.js';
 export { seedAchievementCatalog, seedAchievements } from './seed/index.js';
 export type { AchievementSeedAchievement, AchievementSeedCatalogRow, AchievementSeedInput, AchievementSeedLocalizedText, AchievementSeedTier, } from './seed/index.js';
-export { evaluateRules, evaluateRuleProgress, collectAchievementCompleteRefs, buildCatalogProgressGroups, getUserProgress, getMetricLeaderboard, grantAchievement, loadMetricDoc, recordEvent, recordLog, recordMetricChange, rebuildMetricBalance, rebuildMetricBalancesForUser, reconcileProgression, reconcileUserProgression, releasePendingAchievementReviews, releasePendingTierReviews, resolveCurrentTier, resolveElapsedAnchor, resolveMetricValue, resolveTierProgress, reviewAchievementRequest, submitAchievementRequest, syncTierChangedLog, syncTierProgression, syncCompositeProgression, catalogRef, transitionLogData, transitionToId, validateRuleGroup, validateRuleNode, } from './services/achievement/index.js';
-export type { ResolvedTier, RuleGroup, TierLadderProgress, CatalogProgressGroup, CatalogProgressItem, CatalogRef, TransitionLogData, MetricLeaderboardResult, MetricLeaderboardRow, ReconcileProgressionArgs, ReconcileProgressionResult, ReleaseReviewGateResult, } from './services/achievement/index.js';
-export type { BuiltInEventType, BuiltInRuleType, AchievementCollectionKey, AchievementCollectionOverride, AchievementCollectionsOptions, AchievementEndpointsOptions, AchievementMetricAnchor, AchievementMetricAnchorConfig, AchievementMetricAnchorEntry, AchievementPluginOptions, AchievementRuleType, AchievementScopeConfig, AchievementUsersOptions, } from './types.js';
+export { evaluateRules, evaluateRuleProgress, collectAchievementCompleteRefs, buildCatalogProgressGroups, buildUnlockRequirementLeaves, getUserProgress, loadUserProgressReviews, getMetricLeaderboard, grantAchievement, loadMetricDoc, recordEvent, recordLog, recordMetricChange, rebuildMetricBalance, rebuildMetricBalancesForUser, reconcileProgression, reconcileUserProgression, releasePendingAchievementReviews, releasePendingTierReviews, resolveCurrentTier, resolveElapsedAnchor, resolveMetricValue, resolveTierProgress, reviewAchievementRequest, submitAchievementRequest, syncTierChangedLog, syncTierProgression, syncCompositeProgression, catalogRef, transitionLogData, transitionToId, logSubject, readLogSubject, validateRuleGroup, validateRuleNode, } from './services/achievement/index.js';
+export type { ResolvedTier, RuleGroup, TierLadderProgress, CatalogProgressGroup, CatalogProgressItem, UnlockRequirementLeaf, UnlockRequirementRelation, GetUserProgressInclude, UserProgressMeResponse, UserProgressReviews, UserProgressTierRequest, CatalogRef, TransitionLogData, LogSubjectRef, MetricLeaderboardResult, MetricLeaderboardRow, ReconcileProgressionArgs, ReconcileProgressionResult, ReleaseReviewGateResult, } from './services/achievement/index.js';
+export type { BuiltInEventType, BuiltInRuleType, AchievementCollectionKey, AchievementCollectionOverride, AchievementCollectionsOptions, AchievementEndpointsOptions, AchievementMetricAnchor, AchievementMetricAnchorConfig, AchievementMetricAnchorEntry, AchievementPluginOptions, AchievementRuleType, AchievementScopeConfig, AchievementSubjectsOptions, AchievementUsersOptions, } from './types.js';
 export { DEFAULT_COLLECTION_BASE_SLUGS, DEFAULT_COLLECTION_PREFIX, DEFAULT_ADMIN_GROUP } from './collections/slugs.js';
-export { DEFAULT_ME_ENDPOINT_PATH, DEFAULT_LEADERBOARD_ENDPOINT_PATH, DEFAULT_RECONCILE_ENDPOINT_PATH, } from './defaults.js';
+export { DEFAULT_ME_ENDPOINT_PATH, DEFAULT_LEADERBOARD_ENDPOINT_PATH, DEFAULT_RECONCILE_ENDPOINT_PATH, resolveSubjectCollections, } from './defaults.js';
 export { collectionOf, slugOf } from './collections/helpers.js';
+export { eachRuleLeaf } from './collections/hooks/eachRuleLeaf.js';
 export { isAchievementPluginEnabled } from './enabled.js';
 export { descriptionToPlaintext } from './fields/descriptionPlaintext.js';
 export { plainTextToLexical } from './fields/plainTextToLexical.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,+BAA+B,EAC/B,kBAAkB,EAClB,cAAc,GACf,MAAM,cAAc,CAAA;AACrB,YAAY,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAC1E,YAAY,EACV,0BAA0B,EAC1B,yBAAyB,EACzB,oBAAoB,EACpB,4BAA4B,EAC5B,mBAAmB,GACpB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,8BAA8B,EAC9B,0BAA0B,EAC1B,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,aAAa,EACb,WAAW,EACX,SAAS,EACT,kBAAkB,EAClB,oBAAoB,EACpB,4BAA4B,EAC5B,oBAAoB,EACpB,wBAAwB,EACxB,gCAAgC,EAChC,yBAAyB,EACzB,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,wBAAwB,EACxB,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,iCAAiC,CAAA;AACxC,YAAY,EACV,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,UAAU,EACV,iBAAiB,EACjB,uBAAuB,EACvB,oBAAoB,EACpB,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,GACxB,MAAM,iCAAiC,CAAA;AACxC,YAAY,EACV,gBAAgB,EAChB,eAAe,EACf,wBAAwB,EACxB,6BAA6B,EAC7B,6BAA6B,EAC7B,2BAA2B,EAC3B,uBAAuB,EACvB,6BAA6B,EAC7B,4BAA4B,EAC5B,wBAAwB,EACxB,mBAAmB,EACnB,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,6BAA6B,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AACtH,OAAO,EACL,wBAAwB,EACxB,iCAAiC,EACjC,+BAA+B,GAChC,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAA;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAA;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,+BAA+B,EAC/B,kBAAkB,EAClB,cAAc,GACf,MAAM,cAAc,CAAA;AACrB,YAAY,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAC1E,YAAY,EACV,0BAA0B,EAC1B,yBAAyB,EACzB,oBAAoB,EACpB,4BAA4B,EAC5B,mBAAmB,GACpB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,8BAA8B,EAC9B,0BAA0B,EAC1B,4BAA4B,EAC5B,eAAe,EACf,uBAAuB,EACvB,oBAAoB,EACpB,gBAAgB,EAChB,aAAa,EACb,WAAW,EACX,SAAS,EACT,kBAAkB,EAClB,oBAAoB,EACpB,4BAA4B,EAC5B,oBAAoB,EACpB,wBAAwB,EACxB,gCAAgC,EAChC,yBAAyB,EACzB,kBAAkB,EAClB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,wBAAwB,EACxB,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,EACxB,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,UAAU,EACV,cAAc,EACd,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,iCAAiC,CAAA;AACxC,YAAY,EACV,YAAY,EACZ,SAAS,EACT,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,qBAAqB,EACrB,yBAAyB,EACzB,sBAAsB,EACtB,sBAAsB,EACtB,mBAAmB,EACnB,uBAAuB,EACvB,UAAU,EACV,iBAAiB,EACjB,aAAa,EACb,uBAAuB,EACvB,oBAAoB,EACpB,wBAAwB,EACxB,0BAA0B,EAC1B,uBAAuB,GACxB,MAAM,iCAAiC,CAAA;AACxC,YAAY,EACV,gBAAgB,EAChB,eAAe,EACf,wBAAwB,EACxB,6BAA6B,EAC7B,6BAA6B,EAC7B,2BAA2B,EAC3B,uBAAuB,EACvB,6BAA6B,EAC7B,4BAA4B,EAC5B,wBAAwB,EACxB,mBAAmB,EACnB,sBAAsB,EACtB,0BAA0B,EAC1B,uBAAuB,GACxB,MAAM,YAAY,CAAA;AACnB,OAAO,EAAE,6BAA6B,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AACtH,OAAO,EACL,wBAAwB,EACxB,iCAAiC,EACjC,+BAA+B,EAC/B,yBAAyB,GAC1B,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAA;AAClE,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAA;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAA;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA"}

package/dist/index.js

@@ -1,10 +1,11 @@
 export { DEFAULT_ACHIEVEMENT_METRIC, DEFAULT_ACHIEVEMENT_METRIC_SLUG, ENGINE_EVENT_TYPES, ENGINE_METRICS, } from './catalog.js';
 export { achievementPlugin } from './plugin.js';
 export { seedAchievementCatalog, seedAchievements } from './seed/index.js';
-export { evaluateRules, evaluateRuleProgress, collectAchievementCompleteRefs, buildCatalogProgressGroups, getUserProgress, getMetricLeaderboard, grantAchievement, loadMetricDoc, recordEvent, recordLog, recordMetricChange, rebuildMetricBalance, rebuildMetricBalancesForUser, reconcileProgression, reconcileUserProgression, releasePendingAchievementReviews, releasePendingTierReviews, resolveCurrentTier, resolveElapsedAnchor, resolveMetricValue, resolveTierProgress, reviewAchievementRequest, submitAchievementRequest, syncTierChangedLog, syncTierProgression, syncCompositeProgression, catalogRef, transitionLogData, transitionToId, validateRuleGroup, validateRuleNode, } from './services/achievement/index.js';
+export { evaluateRules, evaluateRuleProgress, collectAchievementCompleteRefs, buildCatalogProgressGroups, buildUnlockRequirementLeaves, getUserProgress, loadUserProgressReviews, getMetricLeaderboard, grantAchievement, loadMetricDoc, recordEvent, recordLog, recordMetricChange, rebuildMetricBalance, rebuildMetricBalancesForUser, reconcileProgression, reconcileUserProgression, releasePendingAchievementReviews, releasePendingTierReviews, resolveCurrentTier, resolveElapsedAnchor, resolveMetricValue, resolveTierProgress, reviewAchievementRequest, submitAchievementRequest, syncTierChangedLog, syncTierProgression, syncCompositeProgression, catalogRef, transitionLogData, transitionToId, logSubject, readLogSubject, validateRuleGroup, validateRuleNode, } from './services/achievement/index.js';
 export { DEFAULT_COLLECTION_BASE_SLUGS, DEFAULT_COLLECTION_PREFIX, DEFAULT_ADMIN_GROUP } from './collections/slugs.js';
-export { DEFAULT_ME_ENDPOINT_PATH, DEFAULT_LEADERBOARD_ENDPOINT_PATH, DEFAULT_RECONCILE_ENDPOINT_PATH, } from './defaults.js';
+export { DEFAULT_ME_ENDPOINT_PATH, DEFAULT_LEADERBOARD_ENDPOINT_PATH, DEFAULT_RECONCILE_ENDPOINT_PATH, resolveSubjectCollections, } from './defaults.js';
 export { collectionOf, slugOf } from './collections/helpers.js';
+export { eachRuleLeaf } from './collections/hooks/eachRuleLeaf.js';
 export { isAchievementPluginEnabled } from './enabled.js';
 export { descriptionToPlaintext } from './fields/descriptionPlaintext.js';
 export { plainTextToLexical } from './fields/plainTextToLexical.js';

package/dist/seed/index.d.ts

@@ -57,6 +57,13 @@ export type AchievementSeedCatalogRow = {
     requiresActor?: boolean;
     /** Event types only — when true, logging the event requires metric + change. */
     requiresMetric?: boolean;
+    /** Event types only — when true, logging the event requires a polymorphic `subject`. */
+    requiresSubject?: boolean;
+    /**
+     * Event types only — allowed host collections for `subject.relationTo`.
+     * Empty / omit = any collection from plugin `subjects.collections`.
+     */
+    subjectRelationTo?: string[];
 };
 export type AchievementSeedInput = {
     eventTypes?: AchievementSeedCatalogRow[];

package/dist/seed/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/seed/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/seed/index.ts"],"names":[],"mappings":"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"}

package/dist/seed/index.js

@@ -74,6 +74,10 @@ async function upsertCatalog(payload, key, row) {
             ? {
                 requiresActor: row.requiresActor ?? false,
                 requiresMetric: row.requiresMetric ?? false,
+                requiresSubject: row.requiresSubject ?? false,
+                ...(row.subjectRelationTo && row.subjectRelationTo.length > 0
+                    ? { subjectRelationTo: row.subjectRelationTo }
+                    : { subjectRelationTo: [] }),
             }
             : metricComputed),
     };

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

@@ -0,0 +1,48 @@
+import type { Payload, PayloadRequest } from 'payload';
+export declare const UNLOCK_REQUIREMENT_RELATION_FIELDS: {
+    readonly tier: "tiers";
+    readonly achievement: "achievements";
+    readonly metric: "metrics";
+    readonly eventType: "eventTypes";
+};
+export type UnlockRequirementCollectionKey = (typeof UNLOCK_REQUIREMENT_RELATION_FIELDS)[keyof typeof UNLOCK_REQUIREMENT_RELATION_FIELDS];
+export type UnlockRequirementRelation = {
+    field: keyof typeof UNLOCK_REQUIREMENT_RELATION_FIELDS;
+    collectionKey: UnlockRequirementCollectionKey;
+    id?: string;
+    slug?: string;
+    name?: string;
+};
+/**
+ * Structured unlock/eligibility leaf — catalog names only, no host UI copy.
+ * Hosts format `label` / `detail` from these fields.
+ */
+export type UnlockRequirementLeaf = {
+    id: string;
+    type: string;
+    met: boolean;
+    /** 0..1 from {@link evaluateRuleProgress}. */
+    progress: number;
+    relations: UnlockRequirementRelation[];
+    target?: number;
+    unit?: string;
+    since?: string;
+};
+/**
+ * Walk every leaf in a rule tree, evaluate met/progress, and return catalog-backed
+ * subjects. Payload rows often carry empty `rules: []` + default combinator — those
+ * are still leaves ({@link eachRuleLeaf}).
+ *
+ * `achievement-complete` is omitted by default so hosts can keep those on catalog groups.
+ */
+export declare function buildUnlockRequirementLeaves(args: {
+    payload: Payload;
+    req?: PayloadRequest;
+    userId: string;
+    scopeId: string | null;
+    rules: unknown;
+    ladderRank?: number | null;
+    locale?: string;
+    includeAchievementComplete?: boolean;
+}): Promise<UnlockRequirementLeaf[]>;
+//# sourceMappingURL=buildUnlockRequirementLeaves.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"buildUnlockRequirementLeaves.d.ts","sourceRoot":"","sources":["../../../src/services/achievement/buildUnlockRequirementLeaves.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAOtD,eAAO,MAAM,kCAAkC;;;;;CAKyC,CAAA;AAExF,MAAM,MAAM,8BAA8B,GACxC,CAAC,OAAO,kCAAkC,CAAC,CAAC,MAAM,OAAO,kCAAkC,CAAC,CAAA;AAE9F,MAAM,MAAM,yBAAyB,GAAG;IACtC,KAAK,EAAE,MAAM,OAAO,kCAAkC,CAAA;IACtD,aAAa,EAAE,8BAA8B,CAAA;IAC7C,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED;;;GAGG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,OAAO,CAAA;IACZ,8CAA8C;IAC9C,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,yBAAyB,EAAE,CAAA;IACtC,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAqHD;;;;;;GAMG;AACH,wBAAsB,4BAA4B,CAAC,IAAI,EAAE;IACvD,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,KAAK,EAAE,OAAO,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,0BAA0B,CAAC,EAAE,OAAO,CAAA;CACrC,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,CA8EnC"}

package/dist/services/achievement/buildUnlockRequirementLeaves.js

@@ -0,0 +1,192 @@
+import { eachRuleLeaf } from '../../collections/hooks/eachRuleLeaf.js';
+import { collectionOf } from '../../collections/helpers.js';
+import { evaluateRuleProgress, evaluateRules } from './evaluateRules.js';
+import { relationId } from './relationId.js';
+export const UNLOCK_REQUIREMENT_RELATION_FIELDS = {
+    tier: 'tiers',
+    achievement: 'achievements',
+    metric: 'metrics',
+    eventType: 'eventTypes',
+};
+function relationName(value) {
+    if (value && typeof value === 'object' && 'name' in value) {
+        const name = value.name;
+        if (typeof name === 'string' && name)
+            return name;
+    }
+    return null;
+}
+function relationSlug(value) {
+    if (value && typeof value === 'object' && 'slug' in value) {
+        const slug = value.slug;
+        if (typeof slug === 'string' && slug)
+            return slug;
+    }
+    return null;
+}
+function slugField(rule, relationKey) {
+    const raw = rule[`${relationKey}Slug`];
+    return typeof raw === 'string' && raw ? raw : null;
+}
+function numericTarget(rule) {
+    for (const key of ['amount', 'minimum', 'count']) {
+        const value = rule[key];
+        if (typeof value === 'number' && Number.isFinite(value) && value >= 0)
+            return value;
+    }
+    return null;
+}
+async function resolveCatalogName(args) {
+    const named = relationName(args.value);
+    const slug = args.slug || relationSlug(args.value);
+    const id = relationId(args.value);
+    if (named) {
+        return {
+            ...(id ? { id } : {}),
+            ...(slug ? { slug } : {}),
+            name: named,
+        };
+    }
+    if (slug) {
+        const cached = args.cache.get(`slug:${args.collectionKey}:${slug}`);
+        if (cached)
+            return { ...(id ? { id } : {}), slug, name: cached };
+    }
+    if (id) {
+        const cached = args.cache.get(`id:${args.collectionKey}:${id}`);
+        if (cached) {
+            return { id, ...(slug ? { slug } : {}), name: cached };
+        }
+        try {
+            const doc = (await args.payload.findByID({
+                collection: collectionOf(args.collectionKey),
+                id,
+                depth: 0,
+                overrideAccess: true,
+                req: args.req,
+                ...(args.locale ? { locale: args.locale } : {}),
+            }));
+            const name = (typeof doc?.name === 'string' && doc.name) ||
+                (typeof doc?.slug === 'string' && doc.slug) ||
+                null;
+            if (name) {
+                args.cache.set(`id:${args.collectionKey}:${id}`, name);
+                if (doc?.slug)
+                    args.cache.set(`slug:${args.collectionKey}:${doc.slug}`, name);
+                return { id, ...(doc?.slug ? { slug: doc.slug } : slug ? { slug } : {}), name };
+            }
+        }
+        catch {
+            /* fall through */
+        }
+    }
+    if (slug && !id) {
+        try {
+            const found = await args.payload.find({
+                collection: collectionOf(args.collectionKey),
+                depth: 0,
+                limit: 1,
+                overrideAccess: true,
+                req: args.req,
+                where: { slug: { equals: slug } },
+                ...(args.locale ? { locale: args.locale } : {}),
+            });
+            const doc = found.docs[0];
+            const resolvedId = relationId(doc);
+            const name = (typeof doc?.name === 'string' && doc.name) ||
+                (typeof doc?.slug === 'string' && doc.slug) ||
+                slug;
+            if (resolvedId)
+                args.cache.set(`id:${args.collectionKey}:${resolvedId}`, name);
+            args.cache.set(`slug:${args.collectionKey}:${slug}`, name);
+            return { ...(resolvedId ? { id: resolvedId } : {}), slug, name };
+        }
+        catch {
+            /* fall through */
+        }
+    }
+    return {
+        ...(id ? { id } : {}),
+        ...(slug ? { slug } : {}),
+        ...(slug || id ? { name: slug || id || undefined } : {}),
+    };
+}
+/**
+ * Walk every leaf in a rule tree, evaluate met/progress, and return catalog-backed
+ * subjects. Payload rows often carry empty `rules: []` + default combinator — those
+ * are still leaves ({@link eachRuleLeaf}).
+ *
+ * `achievement-complete` is omitted by default so hosts can keep those on catalog groups.
+ */
+export async function buildUnlockRequirementLeaves(args) {
+    const req = args.req ?? { payload: args.payload };
+    const cache = new Map();
+    const leaves = [];
+    eachRuleLeaf(args.rules, (rule) => {
+        const type = String(rule.type ?? '');
+        if (!type)
+            return;
+        if (type === 'achievement-complete' && !args.includeAchievementComplete)
+            return;
+        leaves.push(rule);
+    });
+    const out = [];
+    for (let index = 0; index < leaves.length; index += 1) {
+        const rule = leaves[index];
+        const type = String(rule.type);
+        const leafRules = [rule];
+        const met = await evaluateRules({
+            payload: args.payload,
+            req,
+            rules: leafRules,
+            userId: args.userId,
+            scopeId: args.scopeId,
+            ladderRank: args.ladderRank,
+        });
+        const progress = await evaluateRuleProgress({
+            payload: args.payload,
+            req,
+            rules: leafRules,
+            userId: args.userId,
+            scopeId: args.scopeId,
+            ladderRank: args.ladderRank,
+        });
+        const relations = [];
+        for (const [field, collectionKey] of Object.entries(UNLOCK_REQUIREMENT_RELATION_FIELDS)) {
+            const key = field;
+            if (rule[key] == null && !slugField(rule, key))
+                continue;
+            const resolved = await resolveCatalogName({
+                payload: args.payload,
+                req,
+                locale: args.locale,
+                collectionKey,
+                value: rule[key],
+                slug: slugField(rule, key),
+                cache,
+            });
+            if (!resolved.id && !resolved.slug && !resolved.name)
+                continue;
+            relations.push({ field: key, collectionKey, ...resolved });
+        }
+        const target = numericTarget(rule);
+        const unit = typeof rule.unit === 'string' && rule.unit ? rule.unit : undefined;
+        // `since` / `unit` only matter when a duration/count target is set (defaults pollute other leaves).
+        const since = target != null && typeof rule.since === 'string' && rule.since ? rule.since : undefined;
+        const subjectKey = relations
+            .map((row) => row.name || row.slug || row.id)
+            .filter(Boolean)
+            .join(':') || 'leaf';
+        out.push({
+            id: `${type}:${index}:${subjectKey}`,
+            type,
+            met,
+            progress,
+            relations,
+            ...(target != null ? { target } : {}),
+            ...(unit ? { unit } : {}),
+            ...(since ? { since } : {}),
+        });
+    }
+    return out;
+}

package/dist/services/achievement/duration.js

@@ -2,7 +2,7 @@ const MS_PER_SECOND = 1_000;
 const MS_PER_MINUTE = 60 * MS_PER_SECOND;
 const MS_PER_HOUR = 60 * MS_PER_MINUTE;
 const MS_PER_DAY = 24 * MS_PER_HOUR;
-/** Fixed-length year for elapsed floors (not calendar years). */
+/** Fixed-length year for elapsed floors (365-day year). */
 const MS_PER_YEAR = 365 * MS_PER_DAY;
 export function durationMs(amount, unit) {
     if (!(typeof amount === 'number') || !Number.isFinite(amount) || amount < 0)

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

@@ -2,6 +2,9 @@ import type { Payload, PayloadRequest } from 'payload';
 export type EventTypeFlags = {
     requiresActor: boolean;
     requiresMetric: boolean;
+    requiresSubject: boolean;
+    /** Allowed host collections for `subject.relationTo` (empty = any plugin allowlist entry). */
+    subjectRelationTo: string[];
 };
 /** Read flags from a loaded event-type document (or populated relationship). */
 export declare function readEventTypeFlags(doc: unknown): EventTypeFlags | null;
@@ -21,4 +24,18 @@ export declare function eventTypeRequiresMetric(args: {
     req?: PayloadRequest;
     typeIdOrDoc: unknown;
 }): Promise<boolean>;
+export declare function eventTypeRequiresSubject(args: {
+    payload: Payload;
+    req?: PayloadRequest;
+    typeIdOrDoc: unknown;
+}): Promise<boolean>;
+/**
+ * Allowed `subject.relationTo` values for this event type.
+ * Empty event-type list → full plugin allowlist. Feature off → [].
+ */
+export declare function eventTypeSubjectRelationTo(args: {
+    payload: Payload;
+    req?: PayloadRequest;
+    typeIdOrDoc: unknown;
+}): Promise<string[]>;
 //# sourceMappingURL=eventTypeRequiresActor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"eventTypeRequiresActor.d.ts","sourceRoot":"","sources":["../../../src/services/achievement/eventTypeRequiresActor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAKtD,MAAM,MAAM,cAAc,GAAG;IAC3B,aAAa,EAAE,OAAO,CAAA;IACtB,cAAc,EAAE,OAAO,CAAA;CACxB,CAAA;AAED,gFAAgF;AAChF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,GAAG,IAAI,CAUtE;AAMD,wDAAwD;AACxD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,WAAW,EAAE,OAAO,CAAA;CACrB,GAAG,OAAO,CAAC,cAAc,CAAC,CAsB1B;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,WAAW,EAAE,OAAO,CAAA;CACrB,GAAG,OAAO,CAAC,OAAO,CAAC,CAEnB;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE;IAClD,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,WAAW,EAAE,OAAO,CAAA;CACrB,GAAG,OAAO,CAAC,OAAO,CAAC,CAEnB"}
+{"version":3,"file":"eventTypeRequiresActor.d.ts","sourceRoot":"","sources":["../../../src/services/achievement/eventTypeRequiresActor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAMtD,MAAM,MAAM,cAAc,GAAG;IAC3B,aAAa,EAAE,OAAO,CAAA;IACtB,cAAc,EAAE,OAAO,CAAA;IACvB,eAAe,EAAE,OAAO,CAAA;IACxB,8FAA8F;IAC9F,iBAAiB,EAAE,MAAM,EAAE,CAAA;CAC5B,CAAA;AAkBD,gFAAgF;AAChF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,GAAG,IAAI,CAsBtE;AAMD,wDAAwD;AACxD,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,WAAW,EAAE,OAAO,CAAA;CACrB,GAAG,OAAO,CAAC,cAAc,CAAC,CAwC1B;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,WAAW,EAAE,OAAO,CAAA;CACrB,GAAG,OAAO,CAAC,OAAO,CAAC,CAEnB;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE;IAClD,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,WAAW,EAAE,OAAO,CAAA;CACrB,GAAG,OAAO,CAAC,OAAO,CAAC,CAEnB;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE;IACnD,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,WAAW,EAAE,OAAO,CAAA;CACrB,GAAG,OAAO,CAAC,OAAO,CAAC,CAEnB;AAED;;;GAGG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE;IACrD,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,WAAW,EAAE,OAAO,CAAA;CACrB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAOpB"}

package/dist/services/achievement/eventTypeRequiresActor.js

@@ -1,16 +1,39 @@
+import { getAchievementOptions } from '../../options-store.js';
 import { collectionOf } from '../../collections/helpers.js';
 import { relationId } from './relationId.js';
+const emptyFlags = {
+    requiresActor: false,
+    requiresMetric: false,
+    requiresSubject: false,
+    subjectRelationTo: [],
+};
+function readSubjectRelationTo(value) {
+    if (!Array.isArray(value))
+        return [];
+    const out = [];
+    for (const entry of value) {
+        if (typeof entry === 'string' && entry.trim())
+            out.push(entry.trim());
+    }
+    return out;
+}
 /** Read flags from a loaded event-type document (or populated relationship). */
 export function readEventTypeFlags(doc) {
     if (!doc || typeof doc !== 'object')
         return null;
     const row = doc;
-    const hasFlagKeys = 'requiresActor' in row || 'requiresMetric' in row || typeof row.slug === 'string';
+    const hasFlagKeys = 'requiresActor' in row ||
+        'requiresMetric' in row ||
+        'requiresSubject' in row ||
+        'subjectRelationTo' in row ||
+        typeof row.slug === 'string';
     if (!hasFlagKeys)
         return null;
     return {
         requiresActor: Boolean(row.requiresActor),
         requiresMetric: Boolean(row.requiresMetric) || row.slug === 'metric.delta',
+        requiresSubject: Boolean(row.requiresSubject),
+        subjectRelationTo: readSubjectRelationTo(row.subjectRelationTo),
     };
 }
 function flagsFromDoc(doc) {
@@ -21,22 +44,32 @@ export async function getEventTypeFlags(args) {
     const embedded = flagsFromDoc(args.typeIdOrDoc);
     if (embedded && args.typeIdOrDoc && typeof args.typeIdOrDoc === 'object') {
         const row = args.typeIdOrDoc;
-        if ('requiresActor' in row || 'requiresMetric' in row || 'slug' in row) {
+        if ('requiresActor' in row ||
+            'requiresMetric' in row ||
+            'requiresSubject' in row ||
+            'subjectRelationTo' in row ||
+            'slug' in row) {
             return embedded;
         }
     }
     const typeId = relationId(args.typeIdOrDoc);
     if (!typeId)
-        return { requiresActor: false, requiresMetric: false };
+        return { ...emptyFlags };
     const found = (await args.payload.findByID({
         collection: collectionOf('eventTypes'),
         id: typeId,
         depth: 0,
         overrideAccess: true,
         req: args.req,
-        select: { requiresActor: true, requiresMetric: true, slug: true },
+        select: {
+            requiresActor: true,
+            requiresMetric: true,
+            requiresSubject: true,
+            subjectRelationTo: true,
+            slug: true,
+        },
     }));
-    return flagsFromDoc(found) ?? { requiresActor: false, requiresMetric: false };
+    return flagsFromDoc(found) ?? { ...emptyFlags };
 }
 export async function eventTypeRequiresActor(args) {
     return (await getEventTypeFlags(args)).requiresActor;
@@ -44,3 +77,21 @@ export async function eventTypeRequiresActor(args) {
 export async function eventTypeRequiresMetric(args) {
     return (await getEventTypeFlags(args)).requiresMetric;
 }
+export async function eventTypeRequiresSubject(args) {
+    return (await getEventTypeFlags(args)).requiresSubject;
+}
+/**
+ * Allowed `subject.relationTo` values for this event type.
+ * Empty event-type list → full plugin allowlist. Feature off → [].
+ */
+export async function eventTypeSubjectRelationTo(args) {
+    const allowlist = getAchievementOptions().subjectCollections;
+    if (allowlist.length === 0)
+        return [];
+    const flags = await getEventTypeFlags(args);
+    if (!flags.requiresSubject)
+        return [];
+    if (flags.subjectRelationTo.length === 0)
+        return [...allowlist];
+    return flags.subjectRelationTo.filter((slug) => allowlist.includes(slug));
+}

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

@@ -1,4 +1,5 @@
 import type { PaginatedDocs, Payload, PayloadRequest } from 'payload';
+import { type UserProgressReviews } from './loadUserProgressReviews.js';
 /** Catalog slice — `description` matches the collection (Lexical JSON, or legacy string). */
 type LeanCatalog = {
     id: string;
@@ -32,10 +33,15 @@ declare function leanRequest(doc: Record<string, unknown>): {
     updatedAt: {} | null;
     createdAt: {} | null;
 };
+export type GetUserProgressInclude = {
+    /** Pending achievement keys + open/rejected tier requests. */
+    reviews?: boolean;
+};
 export type UserProgressMeResponse = PaginatedDocs<ReturnType<typeof leanGrant>> & {
     /** Ladder-derived current tier(s). */
     tiers: LeanTier[];
     requests: ReturnType<typeof leanRequest>[];
+    reviews?: UserProgressReviews;
 };
 /**
  * Current-user snapshot. Top-level Payload `find` shape for **grants**;
@@ -49,6 +55,7 @@ export declare function getUserProgress(args: {
     paging?: GetUserProgressPaging;
     /** Content locale for localized achievement / tier names (falls back to `req.locale`). */
     locale?: string;
+    include?: GetUserProgressInclude;
 }): Promise<UserProgressMeResponse>;
 export {};
 //# sourceMappingURL=getUserProgress.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getUserProgress.d.ts","sourceRoot":"","sources":["../../../src/services/achievement/getUserProgress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAOrE,6FAA6F;AAC7F,KAAK,WAAW,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AACtF,KAAK,QAAQ,GAAG,WAAW,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAA;AAExE,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAmBD,iBAAS,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;;;;EAU9C;AAED,iBAAS,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;;;EAShD;AAoBD,MAAM,MAAM,sBAAsB,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,GAAG;IACjF,sCAAsC;IACtC,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,QAAQ,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,EAAE,CAAA;CAC3C,CAAA;AAkED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,MAAM,CAAC,EAAE,qBAAqB,CAAA;IAC9B,0FAA0F;IAC1F,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAiDlC"}
+{"version":3,"file":"getUserProgress.d.ts","sourceRoot":"","sources":["../../../src/services/achievement/getUserProgress.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAGrE,OAAO,EAA2B,KAAK,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAKhG,6FAA6F;AAC7F,KAAK,WAAW,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,CAAA;AACtF,KAAK,QAAQ,GAAG,WAAW,GAAG;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAA;AAExE,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAmBD,iBAAS,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;;;;EAU9C;AAED,iBAAS,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;;;EAShD;AAoBD,MAAM,MAAM,sBAAsB,GAAG;IACnC,8DAA8D;IAC9D,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,GAAG;IACjF,sCAAsC;IACtC,KAAK,EAAE,QAAQ,EAAE,CAAA;IACjB,QAAQ,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,EAAE,CAAA;IAC1C,OAAO,CAAC,EAAE,mBAAmB,CAAA;CAC9B,CAAA;AAkED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,MAAM,CAAC,EAAE,qBAAqB,CAAA;IAC9B,0FAA0F;IAC1F,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,sBAAsB,CAAA;CACjC,GAAG,OAAO,CAAC,sBAAsB,CAAC,CA0DlC"}