@shaxpir/duiduidui-models 1.9.28 → 1.9.30

package/dist/models/Collection.d.ts

@@ -1,8 +1,10 @@
 import { Doc } from '@shaxpir/sharedb/lib/client';
 import { CompactDateTime } from "@shaxpir/shaxpir-common";
 import { ShareSync } from '../repo';
+import { ArrayView } from './ArrayView';
 import { Conditions } from './Condition';
 import { Content, ContentBody, ContentId, ContentMeta } from "./Content";
+import { AnnotatedPhrase } from './Phrase';
 import { SkillLevel } from './SkillLevel';
 /**
  * Display metadata for a Collection, used in the UI.
@@ -13,6 +15,13 @@ export interface CollectionDisplay {
     icon?: string;
     sort_order: number;
 }
+/**
+ * A phrase explicitly included in a Collection, independent of condition matching.
+ */
+export interface CollectionPhrase {
+    text: string;
+    sense_rank: number;
+}
 /**
  * The payload for a Collection document.
  *
@@ -22,6 +31,7 @@ export interface CollectionDisplay {
 export interface CollectionPayload {
     collection_key: string;
     conditions: Conditions;
+    phrases: CollectionPhrase[];
     display: CollectionDisplay;
     proficiency: SkillLevel;
     term_scores: {
@@ -42,6 +52,7 @@ export interface CollectionBody extends ContentBody {
 export interface CollectionCreateParams {
     collectionKey: string;
     conditions: Conditions;
+    phrases: CollectionPhrase[];
     display: CollectionDisplay;
     isBuiltin?: boolean;
     isVisible?: boolean;
@@ -64,6 +75,7 @@ export declare class Collection extends Content {
         text: string;
         senseRank: number;
     };
+    private _phrasesView;
     constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     /**
      * Create a new Collection for a user.
@@ -72,6 +84,7 @@ export declare class Collection extends Content {
     get payload(): CollectionPayload;
     get collectionKey(): string;
     get conditions(): Conditions;
+    get phrases(): ArrayView<CollectionPhrase>;
     get display(): CollectionDisplay;
     get name(): string;
     get description(): string;
@@ -123,6 +136,13 @@ export declare class Collection extends Content {
         D: number;
         F: number;
     };
+    /**
+     * Check if a phrase belongs to this collection.
+     *
+     * First checks for an exact match in the explicit phrases list,
+     * then falls back to condition matching if no explicit match is found.
+     */
+    matches(phrase: AnnotatedPhrase): boolean;
     /**
      * Update the IRT proficiency rating.
      */

package/dist/models/Collection.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Collection = void 0;
 const shaxpir_common_1 = require("@shaxpir/shaxpir-common");
 const repo_1 = require("../repo");
+const ConditionMatcher_1 = require("../util/ConditionMatcher");
 const SenseRankEncoder_1 = require("../util/SenseRankEncoder");
+const ArrayView_1 = require("./ArrayView");
 const Content_1 = require("./Content");
 const ContentKind_1 = require("./ContentKind");
 const Operation_1 = require("./Operation");
@@ -31,6 +33,7 @@ class Collection extends Content_1.Content {
     }
     constructor(doc, shouldAcquire, shareSync) {
         super(doc, shouldAcquire, shareSync);
+        this._phrasesView = new ArrayView_1.ArrayView(this, ['payload', 'phrases']);
     }
     /**
      * Create a new Collection for a user.
@@ -50,6 +53,7 @@ class Collection extends Content_1.Content {
             payload: {
                 collection_key: params.collectionKey,
                 conditions: params.conditions,
+                phrases: params.phrases,
                 display: params.display,
                 // Initial IRT proficiency - high uncertainty, no data yet
                 proficiency: SkillLevel_1.SkillLevelModel.createDefault(),
@@ -86,6 +90,13 @@ class Collection extends Content_1.Content {
         return this.payload.conditions;
     }
     // ============================================================
+    // Explicit phrases getters
+    // ============================================================
+    get phrases() {
+        this.checkDisposed("Collection.phrases");
+        return this._phrasesView;
+    }
+    // ============================================================
     // Display metadata getters
     // ============================================================
     get display() {
@@ -222,6 +233,27 @@ class Collection extends Content_1.Content {
         };
     }
     // ============================================================
+    // Matching
+    // ============================================================
+    /**
+     * Check if a phrase belongs to this collection.
+     *
+     * First checks for an exact match in the explicit phrases list,
+     * then falls back to condition matching if no explicit match is found.
+     */
+    matches(phrase) {
+        this.checkDisposed("Collection.matches");
+        // First, check for an exact match in the explicit phrases list
+        const phrases = this.payload.phrases;
+        for (const p of phrases) {
+            if (p.text === phrase.text && p.sense_rank === phrase.sense_rank) {
+                return true;
+            }
+        }
+        // If no explicit match, fall back to condition matching
+        return ConditionMatcher_1.ConditionMatcher.matchesConditions(phrase, this.payload.conditions);
+    }
+    // ============================================================
     // Mutators
     // ============================================================
     /**

package/dist/models/Device.d.ts

@@ -89,11 +89,12 @@ export declare class Device extends Content {
     get currentSearchState(): SearchState | undefined;
     /**
      * Returns true if back navigation is possible.
-     * Only returns true if the previous entry is non-empty (has query or conditions).
+     * Skips over empty entries to find a non-empty one.
      */
     get canGoBack(): boolean;
     /**
      * Returns true if forward navigation is possible.
+     * Skips over empty entries to find a non-empty one.
      */
     get canGoForward(): boolean;
     /**
@@ -106,12 +107,12 @@ export declare class Device extends Content {
      */
     pushSearchState(state: SearchState): SearchState | undefined;
     /**
-     * Navigates back in search history.
+     * Navigates back in search history, skipping over empty entries.
      * @returns The search state at the new cursor position, or undefined if can't go back
      */
     goBack(): SearchState | undefined;
     /**
-     * Navigates forward in search history.
+     * Navigates forward in search history, skipping over empty entries.
      * @returns The search state at the new cursor position, or undefined if can't go forward
      */
     goForward(): SearchState | undefined;

package/dist/models/Device.js

@@ -267,24 +267,33 @@ class Device extends Content_1.Content {
     }
     /**
      * Returns true if back navigation is possible.
-     * Only returns true if the previous entry is non-empty (has query or conditions).
+     * Skips over empty entries to find a non-empty one.
      */
     get canGoBack() {
         this.checkDisposed("Device.canGoBack");
         const history = this.searchHistory;
-        if (history.cursor <= 0)
-            return false;
-        // Check if the entry we'd navigate to is non-empty
-        const prevEntry = history.entries[history.cursor - 1];
-        return !(0, SearchState_1.isEmptySearchState)(prevEntry);
+        // Look for any non-empty entry before the cursor
+        for (let i = history.cursor - 1; i >= 0; i--) {
+            if (!(0, SearchState_1.isEmptySearchState)(history.entries[i])) {
+                return true;
+            }
+        }
+        return false;
     }
     /**
      * Returns true if forward navigation is possible.
+     * Skips over empty entries to find a non-empty one.
      */
     get canGoForward() {
         this.checkDisposed("Device.canGoForward");
         const history = this.searchHistory;
-        return history.cursor < history.entries.length - 1;
+        // Look for any non-empty entry after the cursor
+        for (let i = history.cursor + 1; i < history.entries.length; i++) {
+            if (!(0, SearchState_1.isEmptySearchState)(history.entries[i])) {
+                return true;
+            }
+        }
+        return false;
     }
     /**
      * Pushes a new search state onto the history stack.
@@ -328,7 +337,7 @@ class Device extends Content_1.Content {
         return state;
     }
     /**
-     * Navigates back in search history.
+     * Navigates back in search history, skipping over empty entries.
      * @returns The search state at the new cursor position, or undefined if can't go back
      */
     goBack() {
@@ -337,14 +346,21 @@ class Device extends Content_1.Content {
             return undefined;
         }
         const history = this.searchHistory;
-        const newCursor = history.cursor - 1;
+        // Find the first non-empty entry before the cursor
+        let newCursor = history.cursor - 1;
+        while (newCursor >= 0 && (0, SearchState_1.isEmptySearchState)(history.entries[newCursor])) {
+            newCursor--;
+        }
+        if (newCursor < 0) {
+            return undefined;
+        }
         const batch = new Operation_1.BatchOperation(this);
         batch.setPathValue(['payload', 'search_history', 'cursor'], newCursor);
         batch.commit();
         return history.entries[newCursor];
     }
     /**
-     * Navigates forward in search history.
+     * Navigates forward in search history, skipping over empty entries.
      * @returns The search state at the new cursor position, or undefined if can't go forward
      */
     goForward() {
@@ -353,7 +369,14 @@ class Device extends Content_1.Content {
             return undefined;
         }
         const history = this.searchHistory;
-        const newCursor = history.cursor + 1;
+        // Find the first non-empty entry after the cursor
+        let newCursor = history.cursor + 1;
+        while (newCursor < history.entries.length && (0, SearchState_1.isEmptySearchState)(history.entries[newCursor])) {
+            newCursor++;
+        }
+        if (newCursor >= history.entries.length) {
+            return undefined;
+        }
         const batch = new Operation_1.BatchOperation(this);
         batch.setPathValue(['payload', 'search_history', 'cursor'], newCursor);
         batch.commit();

package/package.json

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