@shaxpir/duiduidui-models 1.9.29 → 1.9.31

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/dist/util/Logging.d.ts

@@ -40,6 +40,24 @@ export declare class Logger {
     withClientServiceName(serviceName: string): Logger;
     withClientNodeName(nodeName: string): Logger;
     withClientVersion(version: string): Logger;
+    withPlatform(platform: string): Logger;
+    withDeviceModel(model: string): Logger;
+    withDeviceBrand(brand: string): Logger;
+    withOsVersion(version: string): Logger;
+    withScreenWidth(width: number): Logger;
+    withScreenHeight(height: number): Logger;
+    withPixelRatio(ratio: number): Logger;
+    withLocale(locale: string): Logger;
+    withTimezone(timezone: string): Logger;
+    withIsTablet(isTablet: boolean): Logger;
+    withDeviceYearClass(yearClass: number): Logger;
+    withQueryName(queryName: string): Logger;
+    withResultCount(count: number): Logger;
+    withRowCount(count: number): Logger;
+    withRequestedCount(count: number): Logger;
+    withFromCache(fromCache: boolean): Logger;
+    withSearchQuery(query: string): Logger;
+    withSuccess(success: boolean): Logger;
     withTopic(topic: string): Logger;
     withSubtopic(subtopic: string): Logger;
     withName(name: string): Logger;
@@ -79,6 +97,24 @@ export interface LogFields {
     client_service_name?: string;
     client_node_name?: string;
     client_version?: string;
+    platform?: string;
+    device_model?: string;
+    device_brand?: string;
+    os_version?: string;
+    screen_width?: number;
+    screen_height?: number;
+    pixel_ratio?: number;
+    locale?: string;
+    timezone?: string;
+    is_tablet?: boolean;
+    device_year_class?: number;
+    query_name?: string;
+    result_count?: number;
+    row_count?: number;
+    requested_count?: number;
+    from_cache?: boolean;
+    search_query?: string;
+    success?: boolean;
     context?: string;
     name?: string;
     topic?: string;

package/dist/util/Logging.js

@@ -139,6 +139,78 @@ class Logger {
         this.withField('client_version', version);
         return this;
     }
+    withPlatform(platform) {
+        this.withField('platform', platform);
+        return this;
+    }
+    withDeviceModel(model) {
+        this.withField('device_model', model);
+        return this;
+    }
+    withDeviceBrand(brand) {
+        this.withField('device_brand', brand);
+        return this;
+    }
+    withOsVersion(version) {
+        this.withField('os_version', version);
+        return this;
+    }
+    withScreenWidth(width) {
+        this.withField('screen_width', width);
+        return this;
+    }
+    withScreenHeight(height) {
+        this.withField('screen_height', height);
+        return this;
+    }
+    withPixelRatio(ratio) {
+        this.withField('pixel_ratio', ratio);
+        return this;
+    }
+    withLocale(locale) {
+        this.withField('locale', locale);
+        return this;
+    }
+    withTimezone(timezone) {
+        this.withField('timezone', timezone);
+        return this;
+    }
+    withIsTablet(isTablet) {
+        this.withField('is_tablet', isTablet);
+        return this;
+    }
+    withDeviceYearClass(yearClass) {
+        this.withField('device_year_class', yearClass);
+        return this;
+    }
+    withQueryName(queryName) {
+        this.withField('query_name', queryName);
+        return this;
+    }
+    withResultCount(count) {
+        this.withField('result_count', count);
+        return this;
+    }
+    withRowCount(count) {
+        this.withField('row_count', count);
+        return this;
+    }
+    withRequestedCount(count) {
+        this.withField('requested_count', count);
+        return this;
+    }
+    withFromCache(fromCache) {
+        this.withField('from_cache', fromCache);
+        return this;
+    }
+    withSearchQuery(query) {
+        this.withField('search_query', query);
+        return this;
+    }
+    withSuccess(success) {
+        this.withField('success', success);
+        return this;
+    }
     withTopic(topic) {
         this.withField('topic', topic);
         return this;
@@ -347,6 +419,14 @@ class Logger {
             case 'client_service_name':
             case 'client_node_name':
             case 'client_version':
+            case 'platform':
+            case 'device_model':
+            case 'device_brand':
+            case 'os_version':
+            case 'locale':
+            case 'timezone':
+            case 'query_name':
+            case 'search_query':
             case 'context':
             case 'topic':
             case 'subtopic':
@@ -386,6 +466,9 @@ class Logger {
             case 'using_jwt':
             case 'using_pass_hash':
             case 'ignore_conflict':
+            case 'is_tablet':
+            case 'from_cache':
+            case 'success':
                 if (value != null && value != undefined && typeof value !== 'boolean') {
                     ;
                     throw new Error(Logger.makeTypeErrorMessage(key, value, 'boolean'));
@@ -396,6 +479,13 @@ class Logger {
             case 'duration_millis':
             case 'file_size':
             case 'doc_version':
+            case 'screen_width':
+            case 'screen_height':
+            case 'pixel_ratio':
+            case 'device_year_class':
+            case 'result_count':
+            case 'row_count':
+            case 'requested_count':
                 if (value != null && value != undefined && typeof value !== 'number') {
                     throw new Error(Logger.makeTypeErrorMessage(key, value, 'number'));
                 }

package/package.json

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