@ray-js/t-agent 0.2.7 → 0.2.8-beta.10

package/dist/chat/ChatBubbleTile.d.ts

@@ -29,7 +29,7 @@ export default class ChatBubbleTile extends ChatTile<BubbleTileData> {
         id: string;
         type: string;
         locked: boolean;
-        children: import("./types").ChatTileObject<any>[];
-        fallback?: import("./types").TipTileData | undefined;
+        children: import("./types").ChatTileObject[];
+        fallback?: import("./types").TipTileData;
     };
 }

package/dist/chat/ChatMessage.js

@@ -8,7 +8,8 @@ import "core-js/modules/web.dom-collections.iterator.js";
 import { ChatMessageStatus } from './types';
 import ChatTile from './ChatTile';
 import ChatBubbleTile from './ChatBubbleTile';
-import { deepCloneToPlainObject, deepMerge, generateId } from './utils';
+import { deepCloneToPlainObject, generateId } from './utils';
+import { deepmerge } from './deepmerge';
 import { getLogger } from './Logger';
 export const logger = getLogger('TAgent/ChatAgent');
 export default class ChatMessage {
@@ -65,7 +66,7 @@ export default class ChatMessage {
   show() {
     return this.agent.runWithCatchError(async () => {
       if (this._isShow) {
-        console.warn('message is already show');
+        logger.warn('message is already show');
         return;
       }
       await this.agent.hooks.callHook('onMessageChange:before', 'show', this);
@@ -78,7 +79,7 @@ export default class ChatMessage {
   update() {
     return this.agent.runWithCatchError(async () => {
       if (!this._isShow) {
-        console.warn('message is not show');
+        logger.warn('message is not show');
         return;
       }
       await this.agent.hooks.callHook('onMessageChange:before', 'update', this);
@@ -93,12 +94,13 @@ export default class ChatMessage {
   remove() {
     return this.agent.runWithCatchError(async () => {
       if (!this._isShow) {
-        console.warn('message is not show');
+        logger.warn('message is not show');
         return;
       }
       await this.agent.hooks.callHook('onMessageChange:before', 'remove', this);
       await this.agent.hooks.callHook('onMessageChange', 'remove', this);
       this.agent.session.unbindMessage(this);
+      this._isShow = false;
       await this.agent.hooks.callHook('onMessageChange:after', 'remove', this);
     });
   }
@@ -146,7 +148,7 @@ export default class ChatMessage {
     if (override) {
       this.meta = meta;
     } else {
-      this.meta = deepMerge(this.meta, meta);
+      this.meta = deepmerge(this.meta, meta);
     }
     return this;
   }

package/dist/chat/ChatSession.d.ts

@@ -14,7 +14,7 @@ export default class ChatSession {
     constructor(agent: ChatAgent);
     initValue: (key: string, value: any) => void;
     set: (key: string, value: any) => Promise<void>;
-    get: <T = any>(key: string, defaultValue?: T | undefined) => any;
+    get: <T = any>(key: string, defaultValue?: T) => T;
     getData: () => Record<string, any>;
     initMessages: (messages: ChatMessage[]) => void;
     getTileById: (id: string) => ChatTile<any> | undefined;
@@ -22,7 +22,7 @@ export default class ChatSession {
     unbindTile: (tile: ChatTile) => void;
     bindMessage: (message: ChatMessage) => void;
     unbindMessage: (message: ChatMessage) => void;
-    onChange: (fn: ChatSessionHooks['onChange']) => () => void;
+    onChange: (fn: ChatSessionHooks["onChange"]) => () => void;
     getLatestMessage: () => ChatMessage | undefined;
     dispose: () => Promise<void>;
 }

package/dist/chat/ChatSession.js

@@ -100,10 +100,5 @@ export default class ChatSession {
     });
     this.agent = agent;
     this.hooks = createHooks();
-    const hooks = ['onChange'];
-    for (let i = 0; i < hooks.length; i++) {
-      const hook = hooks[i];
-      this[hook] = fn => this.hooks.hook(hook, fn);
-    }
   }
 }

package/dist/chat/deepmerge.d.ts

@@ -0,0 +1,27 @@
+type PlainObject = Record<string, unknown>;
+type PropertyKeyLike = string | symbol;
+type KeyGetter = (value: PlainObject) => PropertyKeyLike[];
+type IsMergeableObject = (value: unknown) => boolean;
+type CloneFn = <T>(value: T) => T;
+type DeepMergePairFn = <T, U>(target: T, source: U) => any;
+type DeepMergeFn = (...args: any[]) => any;
+type MergeArrayFn = (target: any[], source: any[]) => any[];
+type CloneProtoObjectFn = <T extends PlainObject>(target: T) => T;
+interface MergeArrayUtils {
+    clone: CloneFn;
+    deepmerge: DeepMergePairFn;
+    getKeys: KeyGetter;
+    isMergeableObject: IsMergeableObject;
+}
+interface DeepMergeOptions {
+    all?: boolean;
+    symbols?: boolean;
+    onlyDefinedProperties?: boolean;
+    cloneProtoObject?: CloneProtoObjectFn;
+    isMergeableObject?: IsMergeableObject;
+    mergeArray?: (utils: MergeArrayUtils) => MergeArrayFn;
+}
+declare function defaultIsMergeableObjectFactory(): IsMergeableObject;
+export declare function deepmergeConstructor(options?: DeepMergeOptions): DeepMergeFn;
+export declare const deepmerge: DeepMergeFn;
+export { defaultIsMergeableObjectFactory as isMergeableObject };

package/dist/chat/deepmerge.js

@@ -0,0 +1,141 @@
+import "core-js/modules/es.regexp.constructor.js";
+import "core-js/modules/es.regexp.dot-all.js";
+import "core-js/modules/es.regexp.exec.js";
+const JSON_PROTO = Object.getPrototypeOf({});
+function defaultIsMergeableObjectFactory() {
+  return function (value) {
+    return typeof value === 'object' && value !== null && !(value instanceof RegExp) && !(value instanceof Date);
+  };
+}
+export function deepmergeConstructor(options) {
+  function isNotPrototypeKey(value) {
+    return value !== 'constructor' && value !== 'prototype' && value !== '__proto__';
+  }
+  function cloneArray(value) {
+    let i = 0;
+    const il = value.length;
+    const result = new Array(il);
+    for (i; i < il; ++i) {
+      result[i] = clone(value[i]);
+    }
+    return result;
+  }
+  function cloneObject(target) {
+    const result = {};
+    if (cloneProtoObject && Object.getPrototypeOf(target) !== JSON_PROTO) {
+      return cloneProtoObject(target);
+    }
+    const targetKeys = getKeys(target);
+    let i;
+    let il;
+    let key;
+    for (i = 0, il = targetKeys.length; i < il; ++i) {
+      isNotPrototypeKey(key = targetKeys[i]) && (result[key] = clone(target[key]));
+    }
+    return result;
+  }
+  const propertyIsEnumerable = Object.prototype.propertyIsEnumerable;
+  const getKeys = options !== null && options !== void 0 && options.symbols ? function (value) {
+    const result = Object.keys(value);
+    const keys = Object.getOwnPropertySymbols(value);
+    for (let i = 0, il = keys.length; i < il; ++i) {
+      propertyIsEnumerable.call(value, keys[i]) && result.push(keys[i]);
+    }
+    return result;
+  } : value => Object.keys(value);
+  const cloneProtoObject = typeof (options === null || options === void 0 ? void 0 : options.cloneProtoObject) === 'function' ? options.cloneProtoObject : undefined;
+  const isMergeableObject = typeof (options === null || options === void 0 ? void 0 : options.isMergeableObject) === 'function' ? options.isMergeableObject : defaultIsMergeableObjectFactory();
+  const onlyDefinedProperties = (options === null || options === void 0 ? void 0 : options.onlyDefinedProperties) === true;
+  function isPrimitive(value) {
+    return typeof value !== 'object' || value === null;
+  }
+  const mergeArray = options && typeof options.mergeArray === 'function' ? options.mergeArray({
+    clone,
+    deepmerge: _deepmerge,
+    getKeys,
+    isMergeableObject
+  }) : function (target, source) {
+    const tl = target.length;
+    const sl = source.length;
+    let i = 0;
+    const result = new Array(tl + sl);
+    for (i; i < tl; ++i) {
+      result[i] = clone(target[i]);
+    }
+    for (i = 0; i < sl; ++i) {
+      result[i + tl] = clone(source[i]);
+    }
+    return result;
+  };
+  function clone(entry) {
+    return isMergeableObject(entry) ? Array.isArray(entry) ? cloneArray(entry) : cloneObject(entry) : entry;
+  }
+  function mergeObject(target, source) {
+    const result = {};
+    const targetKeys = getKeys(target);
+    const sourceKeys = getKeys(source);
+    let i;
+    let il;
+    let key;
+    for (i = 0, il = targetKeys.length; i < il; ++i) {
+      isNotPrototypeKey(key = targetKeys[i]) && sourceKeys.indexOf(key) === -1 && (result[key] = clone(target[key]));
+    }
+    for (i = 0, il = sourceKeys.length; i < il; ++i) {
+      if (!isNotPrototypeKey(key = sourceKeys[i])) {
+        continue;
+      }
+      if (key in target) {
+        if (targetKeys.indexOf(key) !== -1) {
+          if (cloneProtoObject && isMergeableObject(source[key]) && Object.getPrototypeOf(source[key]) !== JSON_PROTO) {
+            result[key] = cloneProtoObject(source[key]);
+          } else {
+            result[key] = _deepmerge(target[key], source[key]);
+          }
+        }
+      } else {
+        if (onlyDefinedProperties && typeof source[key] === 'undefined') {
+          continue;
+        }
+        result[key] = clone(source[key]);
+      }
+    }
+    return result;
+  }
+  function _deepmerge(target, source) {
+    if (onlyDefinedProperties && typeof source === 'undefined') {
+      return clone(target);
+    }
+    const sourceIsArray = Array.isArray(source);
+    const targetIsArray = Array.isArray(target);
+    if (isPrimitive(source)) {
+      return source;
+    }
+    if (!isMergeableObject(target)) {
+      return clone(source);
+    }
+    if (sourceIsArray && targetIsArray) {
+      return mergeArray(target, source);
+    }
+    if (sourceIsArray !== targetIsArray) {
+      return clone(source);
+    }
+    return mergeObject(target, source);
+  }
+  return options !== null && options !== void 0 && options.all ? function () {
+    switch (arguments.length) {
+      case 0:
+        return {};
+      case 1:
+        return clone(arguments.length <= 0 ? undefined : arguments[0]);
+      case 2:
+        return _deepmerge(arguments.length <= 0 ? undefined : arguments[0], arguments.length <= 1 ? undefined : arguments[1]);
+    }
+    let result = {};
+    for (let i = 0, il = arguments.length; i < il; ++i) {
+      result = _deepmerge(result, i < 0 || arguments.length <= i ? undefined : arguments[i]);
+    }
+    return result;
+  } : _deepmerge;
+}
+export const deepmerge = deepmergeConstructor();
+export { defaultIsMergeableObjectFactory as isMergeableObject };

package/dist/chat/index.d.ts

@@ -12,3 +12,4 @@ export { ChatAgent, ChatSession, StreamResponse, ChatTile, ChatBubbleTile, ChatM
 export * from './createChatAgent';
 export * from './types';
 export * from './json';
+export * from './deepmerge';

package/dist/chat/index.js

@@ -1,3 +1,4 @@
+/* istanbul ignore file */
 import ChatAgent from './ChatAgent';
 import ChatSession from './ChatSession';
 import StreamResponse from './StreamResponse';
@@ -11,4 +12,5 @@ export { createHooks, Hookable } from 'hookable';
 export { ChatAgent, ChatSession, StreamResponse, ChatTile, ChatBubbleTile, ChatMessage, generateId, getLogger, Logger, Emitter, EmitterEvent, isAbortError, shuffleWithSeed };
 export * from './createChatAgent';
 export * from './types';
-export * from './json';
+export * from './json';
+export * from './deepmerge';

package/dist/chat/json.js

@@ -297,6 +297,7 @@ function strip(tokens) {
         // Dangling key
         // Check "aggressive" strip for empty objects logic from original
         const n = types.length;
+        /* istanbul ignore else -- n<2 is structurally unreachable: a dangling IsKey string always has at least a preceding '{' token */
         if (n >= 2) {
           const t2Type = types[n - 2];
           const t2Val = values[n - 2];
@@ -309,6 +310,8 @@ function strip(tokens) {
               continue;
             }
           }
+
+          /* istanbul ignore next: defensive branch for malformed token sequences */
           if (t2Type === TokenType.Paren && t2Val === '[') {
             if (n >= 3 && types[n - 3] === TokenType.Delimiter) {
               // , [ "key" -> pop 3
@@ -345,6 +348,7 @@ function strip(tokens) {
     }
     if (t === TokenType.Paren) {
       if (v === '[') {
+        /* istanbul ignore next: defensive branch for malformed token sequences */
         if (types.length >= 2 && types[types.length - 2] === TokenType.Delimiter) {
           types.length -= 2;
           values.length -= 2;
@@ -372,6 +376,7 @@ function unstrip(tokens) {
     const t = types[i];
     const v = values[i];
     if (t === TokenType.Brace) {
+      /* istanbul ignore else -- tokenizer only emits '{' or '}' for Brace tokens */
       if (v === '{') {
         stack.push('}');
       } else if (v === '}') {
@@ -380,6 +385,7 @@ function unstrip(tokens) {
         stack.pop();
       }
     } else if (t === TokenType.Paren) {
+      /* istanbul ignore else -- tokenizer only emits '[' or ']' for Paren tokens */
       if (v === '[') {
         stack.push(']');
       } else if (v === ']') {
@@ -442,7 +448,6 @@ function generate(tokens) {
 
 /** * Best-effort partial JSON parser: tries to complete dangling structures * and then JSON.parse */
 function stripCodeFence(input) {
-  if (typeof input !== 'string') return input;
   const trimmed = input.trim();
 
   // 只处理以 ``` 或 ~~~ 开头的

package/dist/chat/types.js

@@ -1,3 +1,5 @@
+/* istanbul ignore file */
+
 export let ChatCardType = /*#__PURE__*/function (ChatCardType) {
   ChatCardType["CUSTOM"] = "custom";
   ChatCardType["BUILD_IN"] = "buildIn";

package/dist/chat/utils.d.ts

@@ -1,5 +1,4 @@
 export declare function generateId(length?: number): string;
 export declare function deepCloneToPlainObject(obj: any, visited?: WeakMap<object, any>): any;
-export declare function deepMerge(target: any, source: any): any;
 export declare function isAbortError(reason: any): any;
 export declare function shuffleWithSeed<T>(array: T[], seed: string): T[];

package/dist/chat/utils.js

@@ -21,7 +21,6 @@ export function deepCloneToPlainObject(obj) {
 
   // 如果是基本类型（数字、字符串、布尔等），直接返回自身；函数在 JSON 中会被忽略
   if (typeof obj !== 'object') return obj;
-  if (typeof obj === 'function') return undefined;
 
   // 如果对象已被处理过，直接返回缓存结果，防止循环引用
   if (visited.has(obj)) return visited.get(obj);
@@ -86,29 +85,6 @@ export function deepCloneToPlainObject(obj) {
   }
   return clonedObj;
 }
-export function deepMerge(target, source) {
-  if (typeof target !== 'object' || target === null) {
-    return source; // 如果目标不是对象，直接返回来源
-  }
-  if (typeof source !== 'object' || source === null) {
-    return target; // 如果来源不是对象，返回目标
-  }
-  for (const key in source) {
-    if (Object.prototype.hasOwnProperty.call(source, key)) {
-      const sourceValue = source[key];
-      const targetValue = target[key];
-
-      // 如果是对象，递归合并
-      if (typeof sourceValue === 'object' && sourceValue !== null) {
-        target[key] = deepMerge(Array.isArray(targetValue) ? [] : targetValue || {}, sourceValue);
-      } else {
-        // 否则直接赋值
-        target[key] = sourceValue;
-      }
-    }
-  }
-  return target;
-}
 export function isAbortError(reason) {
   return reason && typeof Error !== 'undefined' && reason instanceof Error && reason.name === 'AbortError';
 }

package/dist/index.js

@@ -1,3 +1,4 @@
+/* istanbul ignore file */
 export * from './chat';
 export * from './plugins/ui';
 export * from './plugins/debug';

package/dist/plugins/ui.d.ts

@@ -46,9 +46,9 @@ export declare function withUI(): (agent: ChatAgent) => {
     hooks: import("hookable").Hookable<UIHooks, string>;
     ui: {
         callHook: <K extends keyof UIHooks>(hookName: K, payload: UIHooks[K] extends (context: UIHooksContext<infer P, any>) => void ? P : never) => Promise<UIHooks[K] extends (context: UIHooksContext<any, infer R>) => void ? R : null>;
-        hook: <K_1 extends keyof UIHooks>(hookName: K_1, fn: UIHooks[K_1]) => () => void;
+        hook: <K extends keyof UIHooks>(hookName: K, fn: UIHooks[K]) => () => void;
         emitter: Emitter;
         emitEvent: <T extends keyof UIEventMap>(eventName: T, detail: UIEventMap[T]) => void;
-        onEvent: <T_1 extends keyof UIEventMap>(eventName: T_1, handler: (detail: UIEventMap[T_1]) => void) => () => void;
+        onEvent: <T extends keyof UIEventMap>(eventName: T, handler: (detail: UIEventMap[T]) => void) => () => void;
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/t-agent",
-  "version": "0.2.7",
+  "version": "0.2.8-beta.10",
   "author": "Tuya.inc",
   "license": "MIT",
   "private": false,
@@ -24,7 +24,9 @@
   "scripts": {
     "dev": "ray start --type=component --output dist --emit-declaration-dev",
     "build": "ray build --type=component --output dist",
-    "clean": "rimraf ./dist"
+    "clean": "rimraf ./dist",
+    "test": "jest --runInBand",
+    "test:coverage": "jest --runInBand --coverage"
   },
-  "gitHead": "3afabdd5b9a063d70157f69158ef8edccfdac012"
+  "gitHead": "dd4eae72b02ce8eb7bf75c5aab56aaca0412ea47"
 }