@shaxpir/duiduidui-models 1.9.17 → 1.9.19

package/dist/models/Session.d.ts

@@ -5,13 +5,18 @@ import { Conditions } from './Condition';
 import { Content, ContentBody, ContentId, ContentMeta, ContentRef } from "./Content";
 import { Review } from './Review';
 import { UncertainValue } from './Progress';
+/**
+ * How aggressively the card selection algorithm stretches the user
+ * beyond their current skill level.
+ */
+export type ChallengeLevel = 'easy' | 'mild' | 'medium' | 'hard' | 'max';
 export interface SessionConfig {
     constraints?: {
         card_limit?: number | null;
         time_limit?: number;
     };
     selection?: {
-        difficulty_ramp?: number;
+        challenge?: ChallengeLevel;
         filters?: Conditions;
         strategy?: {
             name: string;

package/dist/util/ConditionMatcher.d.ts

@@ -0,0 +1,57 @@
+import { CompactDateTime } from "@shaxpir/shaxpir-common";
+import { AnyCondition, Conditions } from '../models/Condition';
+/**
+ * Interface for objects that can be matched against Conditions.
+ * This is the minimum set of fields needed for condition matching.
+ *
+ * Implementers include AnnotatedPhrase (in the app) and potentially
+ * other phrase-like objects that need condition checking.
+ */
+export interface ConditionMatchable {
+    tags?: string[];
+    starred_at?: CompactDateTime | null;
+    theta?: number | null;
+    difficulty: number;
+    content_id?: string;
+    last_review_utc?: CompactDateTime | null;
+    created_at?: CompactDateTime;
+    updated_at?: CompactDateTime;
+    review_count?: number;
+    implied_review_count?: number;
+}
+/**
+ * Utility for checking if objects match Conditions.
+ *
+ * This is used by:
+ * - UnifiedSearchQuery to filter search results
+ * - CollectionProficiencyService to determine which Collections contain a phrase
+ */
+export declare const ConditionMatcher: {
+    /**
+     * Check if a single condition matches a matchable object.
+     */
+    conditionMatches(condition: AnyCondition, item: ConditionMatchable): boolean;
+    /**
+     * Check if an item matches all the provided conditions.
+     *
+     * Conditions use three logical groups:
+     * - all: Item must match ALL of these conditions
+     * - any: Item must match AT LEAST ONE of these conditions
+     * - none: Item must match NONE of these conditions
+     */
+    matchesConditions(item: ConditionMatchable, conditions: Conditions | undefined): boolean;
+    /**
+     * Filter an array of items to only those matching the conditions.
+     */
+    filterByConditions<T extends ConditionMatchable>(items: T[], conditions: Conditions | undefined): T[];
+    /**
+     * Check if an item matches any of the provided Conditions sets.
+     * Useful for checking membership in multiple Collections at once.
+     */
+    matchesAnyConditions(item: ConditionMatchable, conditionsList: Conditions[]): boolean;
+    /**
+     * Find all Conditions sets that an item matches.
+     * Returns indices of matching conditions in the input array.
+     */
+    findMatchingConditions(item: ConditionMatchable, conditionsList: Conditions[]): number[];
+};

package/dist/util/ConditionMatcher.js

@@ -0,0 +1,200 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConditionMatcher = void 0;
+/**
+ * Utility for checking if objects match Conditions.
+ *
+ * This is used by:
+ * - UnifiedSearchQuery to filter search results
+ * - CollectionProficiencyService to determine which Collections contain a phrase
+ */
+exports.ConditionMatcher = {
+    /**
+     * Check if a single condition matches a matchable object.
+     */
+    conditionMatches(condition, item) {
+        switch (condition.type) {
+            case 'tag': {
+                const tagCond = condition;
+                const allTags = item.tags || [];
+                return allTags.includes(tagCond.tag);
+            }
+            case 'starred': {
+                const starredCond = condition;
+                const isStarred = item.starred_at !== null && item.starred_at !== undefined;
+                return starredCond.value === isStarred;
+            }
+            case 'theta': {
+                const thetaCond = condition;
+                if (item.theta === null || item.theta === undefined)
+                    return false;
+                if (thetaCond.min !== undefined && item.theta < thetaCond.min)
+                    return false;
+                if (thetaCond.max !== undefined && item.theta > thetaCond.max)
+                    return false;
+                return true;
+            }
+            case 'grade': {
+                const gradeCond = condition;
+                if (item.theta === null || item.theta === undefined)
+                    return false;
+                // Map theta to grade: A (0.8-1), B (0.6-0.8), C (0.4-0.6), D (0.2-0.4), F (0-0.2)
+                let itemGrade;
+                if (item.theta >= 0.8)
+                    itemGrade = 'A';
+                else if (item.theta >= 0.6)
+                    itemGrade = 'B';
+                else if (item.theta >= 0.4)
+                    itemGrade = 'C';
+                else if (item.theta >= 0.2)
+                    itemGrade = 'D';
+                else
+                    itemGrade = 'F';
+                return itemGrade === gradeCond.grade;
+            }
+            case 'difficulty': {
+                const diffCond = condition;
+                if (diffCond.min !== undefined && item.difficulty < diffCond.min)
+                    return false;
+                if (diffCond.max !== undefined && item.difficulty > diffCond.max)
+                    return false;
+                return true;
+            }
+            case 'has_term': {
+                const hasTermCond = condition;
+                const hasTerm = item.content_id !== undefined;
+                return hasTermCond.value === hasTerm;
+            }
+            case 'temporal': {
+                const tempCond = condition;
+                let fieldValue;
+                switch (tempCond.field) {
+                    case 'last_review_utc':
+                        fieldValue = item.last_review_utc;
+                        break;
+                    case 'starred_at':
+                        fieldValue = item.starred_at;
+                        break;
+                    case 'created_at':
+                        fieldValue = item.created_at;
+                        break;
+                    case 'updated_at':
+                        fieldValue = item.updated_at;
+                        break;
+                }
+                if (fieldValue === null || fieldValue === undefined) {
+                    // No value means condition can't be satisfied for most operators
+                    return false;
+                }
+                // For temporal conditions, we'd need to compare against current time
+                // This is complex because we need access to ClockService
+                // For now, return true (don't filter out) - these conditions are
+                // typically used in SQL queries rather than in-memory filtering
+                return true;
+            }
+            case 'count': {
+                const countCond = condition;
+                let fieldValue;
+                switch (countCond.field) {
+                    case 'review_count':
+                        fieldValue = item.review_count ?? 0;
+                        break;
+                    case 'implied_review_count':
+                        fieldValue = item.implied_review_count ?? 0;
+                        break;
+                }
+                switch (countCond.operator) {
+                    case '>': return fieldValue > countCond.value;
+                    case '<': return fieldValue < countCond.value;
+                    case '>=': return fieldValue >= countCond.value;
+                    case '<=': return fieldValue <= countCond.value;
+                    case '=': return fieldValue === countCond.value;
+                    case '!=': return fieldValue !== countCond.value;
+                }
+                return true;
+            }
+            case 'component': {
+                // Component conditions require database lookups and are not
+                // suitable for in-memory filtering. Return true (don't filter out).
+                return true;
+            }
+            default:
+                // For unsupported conditions, default to true (don't filter out)
+                return true;
+        }
+    },
+    /**
+     * Check if an item matches all the provided conditions.
+     *
+     * Conditions use three logical groups:
+     * - all: Item must match ALL of these conditions
+     * - any: Item must match AT LEAST ONE of these conditions
+     * - none: Item must match NONE of these conditions
+     */
+    matchesConditions(item, conditions) {
+        if (!conditions)
+            return true;
+        // Check 'all' conditions - item must match ALL of these
+        if (conditions.all && conditions.all.length > 0) {
+            for (const cond of conditions.all) {
+                if (!exports.ConditionMatcher.conditionMatches(cond, item)) {
+                    return false;
+                }
+            }
+        }
+        // Check 'any' conditions - item must match AT LEAST ONE of these
+        if (conditions.any && conditions.any.length > 0) {
+            let matchedAny = false;
+            for (const cond of conditions.any) {
+                if (exports.ConditionMatcher.conditionMatches(cond, item)) {
+                    matchedAny = true;
+                    break;
+                }
+            }
+            if (!matchedAny)
+                return false;
+        }
+        // Check 'none' conditions - item must match NONE of these
+        if (conditions.none && conditions.none.length > 0) {
+            for (const cond of conditions.none) {
+                if (exports.ConditionMatcher.conditionMatches(cond, item)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    },
+    /**
+     * Filter an array of items to only those matching the conditions.
+     */
+    filterByConditions(items, conditions) {
+        if (!conditions)
+            return items;
+        return items.filter(item => exports.ConditionMatcher.matchesConditions(item, conditions));
+    },
+    /**
+     * Check if an item matches any of the provided Conditions sets.
+     * Useful for checking membership in multiple Collections at once.
+     */
+    matchesAnyConditions(item, conditionsList) {
+        for (const conditions of conditionsList) {
+            if (exports.ConditionMatcher.matchesConditions(item, conditions)) {
+                return true;
+            }
+        }
+        return false;
+    },
+    /**
+     * Find all Conditions sets that an item matches.
+     * Returns indices of matching conditions in the input array.
+     */
+    findMatchingConditions(item, conditionsList) {
+        const matches = [];
+        for (let i = 0; i < conditionsList.length; i++) {
+            if (exports.ConditionMatcher.matchesConditions(item, conditionsList[i])) {
+                matches.push(i);
+            }
+        }
+        return matches;
+    }
+};

package/dist/util/index.d.ts

@@ -1,4 +1,5 @@
 export * from './AvatarUri';
+export * from './ConditionMatcher';
 export * from './Database';
 export * from './Encryption';
 export * from './Logging';

package/dist/util/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./AvatarUri"), exports);
+__exportStar(require("./ConditionMatcher"), exports);
 __exportStar(require("./Database"), exports);
 __exportStar(require("./Encryption"), exports);
 __exportStar(require("./Logging"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaxpir/duiduidui-models",
-  "version": "1.9.17",
+  "version": "1.9.19",
   "repository": {
     "type": "git",
     "url": "https://github.com/shaxpir/duiduidui-models"