dolphindb 3.0.114 → 3.0.118

package/i18n/dict.json

@@ -97,5 +97,8 @@
     },
     "调用 ddb.invoke 的参数中不能同时有 DdbObj 与复杂 js 原生对象": {
         "en": "The parameters of calling ddb.invoke cannot contain both DdbObj and complex js native objects"
+    },
+    "iife 执行的脚本行数应该至少为 2 行": {
+        "en": "The number of script lines executed by iife should be at least 2"
     }
 }

package/index.d.ts

@@ -544,7 +544,7 @@ export interface StreamingParams {
         offset 与流数据表创建时的第一行对应。如果某些行因为内存限制被删除，在决定订阅开始的位置时，这些行仍然考虑在内。 */
     offset?: number;
     filters?: {
-        /** https://docs.dolphindb.cn/zh/help/FunctionsandCommands/FunctionReferences/s/subscribeTable.html#:~:text=%E8%BF%9E%E6%8E%A5%E6%96%B0%E7%9A%84%20leader%E3%80%82-,filter%20%E5%8F%82%E6%95%B0%E9%9C%80%E8%A6%81%E9%85%8D%E5%90%88,-setStreamTableFilterColumn%20%E5%87%BD%E6%95%B0%E4%B8%80%E8%B5%B7 */
+        /** https://test.dolphindb.cn/zh/funcs/s/subscribeTable.html#:~:text=filter%20%E5%8F%82%E6%95%B0%E9%9C%80%E8%A6%81%E9%85%8D%E5%90%88%20setStreamTableFilterColumn%20%E5%87%BD%E6%95%B0%E4%B8%80%E8%B5%B7%E4%BD%BF%E7%94%A8 */
         column?: DdbObj;
         /** 过滤条件的 DolphinDB 表达式 https://dolphindb1.atlassian.net/wiki/spaces/dev/pages/760840447/WebSocketConsole */
         expression?: string;
@@ -583,6 +583,9 @@ export interface DdbEvalOptions {
     urgent?: boolean;
     listener?: DdbMessageListener;
     parse_object?: boolean;
+    iife?: boolean;
+}
+export interface DdbExecuteOptions extends DdbEvalOptions, ConvertOptions {
 }
 type DdbRpcType = 'script' | 'function' | 'variable' | 'connect';
 export interface DdbRpcOptions extends DdbEvalOptions {
@@ -631,6 +634,8 @@ export interface DdbCallOptions extends DdbEvalOptions {
     skip_connection_check?: boolean;
     on_more_messages?: DdbRpcOptions['on_more_messages'];
 }
+export interface DdbInvokeOptions extends DdbCallOptions, ConvertOptions {
+}
 export declare class DDB {
     /** 当前的 session id (http 或 tcp) */
     sid: string;
@@ -769,8 +774,9 @@ export declare class DDB {
                 不做解析，以便后续转发、序列化
                 Set parse_object during this rpc, and restore the original after the end.
                 When it is false, the returned DdbObj only contains buffer and le without parsing,
-                so as to facilitate subsequent forwarding and serialization */
-    eval<T extends DdbObj>(script: string, { urgent, listener, parse_object, }?: DdbEvalOptions): Promise<T>;
+                so as to facilitate subsequent forwarding and serialization
+            - iife?: 使用 `def () { ... } ()` 包裹脚本，return 最后一行，避免变量泄漏 */
+    eval<T extends DdbObj>(script: string, { urgent, listener, parse_object, iife, }?: DdbEvalOptions): Promise<T>;
     /** call function through websocket (function command)
         - func: 函数名  function name
         - args?: `[ ]` 调用参数 (传入的原生 string 和 boolean 会被自动转换为 DdbObj<string> 和 DdbObj<boolean>)
@@ -808,13 +814,13 @@ export declare class DDB {
             - func_type?: 设置 node 参数且参数数组为空时必传，需指定函数类型，其它情况下不传
             - add_node_alias?: 设置 nodes 参数时选传，其它情况不传
             - listener?: 处理本次 rpc 期间的消息 (DdbMessage) */
-    invoke<TResult = any>(func: string, args?: any[], options?: DdbCallOptions): Promise<TResult>;
+    invoke<TResult = any>(func: string, args?: any[], options?: DdbInvokeOptions): Promise<TResult>;
     /** 执行 dolphindb 脚本，返回 js 原生对象或值（调用 DdbObj.data() 后的结果）
         - script?: 执行的脚本
         - options?: 执行选项
             - urgent?: 紧急 flag，确保提交的脚本使用 urgent worker 处理，防止被其它作业阻塞
             - listener?: 处理本次 rpc 期间的消息 (DdbMessage) */
-    execute<TResult = any>(script: string, options?: DdbEvalOptions): Promise<TResult>;
+    execute<TResult = any>(script: string, options?: DdbExecuteOptions): Promise<TResult>;
     /** upload variable through websocket (variable command) */
     upload(
     /** 上传的变量名  Uploaded variables' name */

package/index.js

@@ -3082,8 +3082,19 @@ export class DDB {
                 不做解析，以便后续转发、序列化
                 Set parse_object during this rpc, and restore the original after the end.
                 When it is false, the returned DdbObj only contains buffer and le without parsing,
-                so as to facilitate subsequent forwarding and serialization */
-    async eval(script, { urgent, listener, parse_object, } = {}) {
+                so as to facilitate subsequent forwarding and serialization
+            - iife?: 使用 `def () { ... } ()` 包裹脚本，return 最后一行，避免变量泄漏 */
+    async eval(script, { urgent, listener, parse_object, iife, } = {}) {
+        if (iife) {
+            const lines = script.split_lines();
+            if (lines.length < 2)
+                throw new Error(t('iife 执行的脚本行数应该至少为 2 行'));
+            script =
+                'def () {\n' +
+                    lines.slice(0, -1).indent().join_lines() +
+                    `    return ${lines.last}\n`;
+            '} ()\n';
+        }
         return this.rpc('script', { script, urgent, listener, parse_object });
     }
     /** call function through websocket (function command)
@@ -3199,7 +3210,7 @@ export class DDB {
         const result = simple
             ? await this.call(func, args, options)
             : await this.call('invoke', [func, JSON.stringify(args)], options);
-        return result.data();
+        return result.data(options);
     }
     /** 执行 dolphindb 脚本，返回 js 原生对象或值（调用 DdbObj.data() 后的结果）
         - script?: 执行的脚本
@@ -3208,7 +3219,7 @@ export class DDB {
             - listener?: 处理本次 rpc 期间的消息 (DdbMessage) */
     async execute(script, options) {
         return (await this.eval(script, options))
-            .data();
+            .data(options);
     }
     /** upload variable through websocket (variable command) */
     async upload(