dolphindb 3.1.13 → 3.1.15

package/README.md

@@ -102,8 +102,11 @@ let ddb = new DDB('ws://127.0.0.1:8848')
 // Use HTTPS encryption
 // let ddb = new DDB('wss://dolphindb.com')
 
-// 2.3 Establish a connection to DolphinDB (requires DolphinDB database version no less than 1.30.16 or 2.00.4)
-await ddb.connect()
+// 2.3 Call the DolphinDB add function, automatically connecting to the database (requires DolphinDB version 1.30.16 or 2.00.4 or higher)
+console.log(await ddb.invoke('add', [1, 2])) // Output 3
+
+// 2.4 Disconnect after use to release resources
+ddb.disconnect()
 ```
 
 #### Code completion and function prompt
@@ -539,6 +542,12 @@ console.log(
 )
 ```
 
+### Close the connection
+```ts
+ddb.disconnect()
+```
+
+
 ### Other Examples
 
 ```ts

package/README.zh.md

@@ -98,8 +98,11 @@ let ddb = new DDB('ws://127.0.0.1:8848')
 // 使用 HTTPS 加密
 // let ddb = new DDB('wss://dolphindb.com')
 
-// 2.3 建立到 DolphinDB 的连接（要求 DolphinDB 数据库版本不低于 1.30.16 或 2.00.4）
-await ddb.connect()
+// 2.3 调用 DolphinDB add 函数，调用时自动连接到数据库（要求 DolphinDB 数据库版本不低于 1.30.16 或 2.00.4）
+console.log(await ddb.invoke('add', [1, 2]))  // 输出 3
+
+// 2.4 使用完毕，断开连接释放资源
+ddb.disconnect()
 ```
 
 #### 代码补全、函数提示数据
@@ -519,6 +522,11 @@ console.log(
 )
 ```
 
+### 关闭连接
+```ts
+ddb.disconnect()
+```
+
 ### 其他例子
 
 ```ts

package/browser.d.ts

@@ -184,7 +184,7 @@ export interface InspectOptions {
 export declare function format(type: DdbType, value: DdbValue, le: boolean, options?: InspectOptions): string;
 /** 格式化向量、集合中的第 index 项为字符串，空值返回 'null' 字符串  formatted vector, the index-th item in the collection is a string, a null value returns a 'null' string */
 export declare function formati(obj: DdbVectorObj, index: number, options?: InspectOptions): string;
-export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, char, timestamp }?: ConvertOptions): string | number | bigint | boolean | string[] | number[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbSymbolExtendedValue | DdbExtObjValue | DdbTensorValue | Uint8Array<ArrayBufferLike> | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | BigInt128Array | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | IotVectorItemValue | DdbArrayVectorValue | DdbDecimal128VectorValue | DdbDurationVectorValue | DdbMatrixValue | DdbChartValue;
+export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, char, timestamp }?: ConvertOptions): string | number | bigint | boolean | number[] | Uint8Array<ArrayBufferLike> | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | BigInt128Array | string[] | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | IotVectorItemValue | DdbSymbolExtendedValue | DdbArrayVectorValue | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDecimal128VectorValue | DdbDurationVectorValue | DdbMatrixValue | DdbChartValue | DdbTensorValue | DdbExtObjValue;
 /** 转换一个向量到 js 原生数组 */
 export declare function converts(type: DdbType, value: DdbVectorValue, rows: number, le: boolean, options?: ConvertOptions): any[] | Uint8Array;
 /** 构造 void 类型，默认为 `DdbVoidType.undefined` */

package/browser.js

@@ -3,7 +3,7 @@ import { blue, cyan, green, grey, magenta } from 'xshell/chalk.browser.js';
 import { concat, assert, Lock, genid, seq, zip_object, decode, delay, check } from 'xshell/utils.browser.js';
 import { connect_websocket } from 'xshell/net.browser.js';
 import { t } from "./i18n/index.js";
-import { date2str, datehour2str, datetime2str, ddb_tensor_bytes, DdbChartType, DdbDurationUnit, DdbForm, DdbFunctionType, DdbType, DdbVoidType, dictables, function_definition_patterns, generate_array_type, get_big_int_128, get_time_ddbobj, get_duration_unit, get_type_name, int1282str, ipaddr2str, is_decimal_null_value, is_decimal_type, minute2str, month2str, nanotime2str, nanotimestamp2str, nulls, second2str, set_big_int_128, time2str, timestamp2str, uuid2str, get_times_ddbobj, funcdefs } from "./common.js";
+import { date2str, datehour2str, datetime2str, ddb_tensor_bytes, DdbChartType, DdbDurationUnit, DdbForm, DdbFunctionType, DdbType, DdbVoidType, dictables, function_definition_patterns, generate_array_type, get_big_int_128, get_time_ddbobj, get_duration_unit, get_type_name, int1282str, ipaddr2str, is_decimal_null_value, is_decimal_type, minute2str, month2str, nanotime2str, nanotimestamp2str, nulls, second2str, set_big_int_128, time2str, timestamp2str, uuid2str, get_times_ddbobj, funcdefs, get_number_formatter } from "./common.js";
 export * from "./common.js";
 /** 可以表示所有 DolphinDB 数据库中的数据类型  Can represent data types in all DolphinDB databases */
 export class DdbObj {
@@ -871,7 +871,7 @@ export class DdbObj {
                         case DdbType.handle:
                         case DdbType.datasource:
                         case DdbType.resource:
-                            assert(!value.includes('\0'), t('pack 时字符串中间不能含有 \\0, 否则上传给 DolphinDB 会导致连接断开'));
+                            check(!value.includes('\0'), t('pack 时字符串中间不能含有 \\0, 否则上传给 DolphinDB 会导致连接断开'));
                             return [
                                 DdbObj.enc.encode(value),
                                 Uint8Array.of(0),
@@ -1057,7 +1057,7 @@ export class DdbObj {
                 let bufs = new Array(length * 2);
                 for (let i = 0; i < length; i++) {
                     const s = value[i];
-                    assert(!s.includes('\0'), t('pack 时字符串中间不能含有 \\0, 否则上传给 DolphinDB 会导致连接断开'));
+                    check(!s.includes('\0'), t('pack 时字符串中间不能含有 \\0, 否则上传给 DolphinDB 会导致连接断开'));
                     bufs[2 * i] = this.enc.encode(s);
                     bufs[2 * i + 1] = Uint8Array.of(0);
                 }
@@ -1566,29 +1566,10 @@ export class DdbObj {
         return obj;
     }
 }
-/** 整数一定用这个 number formatter, InspectOptions.decimals 不传也用这个 */
-let default_formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
-let _decimals = 20;
-let _grouping = true;
-/** 缓存，为了优化性能，通常 options.decimals 都是不变的 */
-let _formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
 /** 根据 DdbType 格式化单个元素 (value) 为字符串 */
 export function format(type, value, le, options = {}) {
-    const { nullstr = false, colors = false, quote = false, grouping = true, timestamp = 'ms' } = options;
-    const formatter = (() => {
-        const decimals = options.decimals ?? _decimals;
-        if (decimals !== _decimals || grouping !== _grouping) {
-            _decimals = decimals;
-            _grouping = grouping;
-            default_formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 20, useGrouping: grouping });
-            _formatter = new Intl.NumberFormat('en-US', {
-                maximumFractionDigits: decimals,
-                minimumFractionDigits: decimals,
-                useGrouping: grouping
-            });
-        }
-        return options.decimals === undefined || options.decimals === null ? default_formatter : _formatter;
-    })();
+    const { nullstr = false, colors = false, quote = false, timestamp = 'ms' } = options;
+    const number_formatter = get_number_formatter(options.decimals, options.grouping);
     function get_nullstr() {
         const str = value === DdbVoidType.default ? 'default' : 'null';
         return nullstr ?
@@ -1641,21 +1622,21 @@ export function format(type, value, le, options = {}) {
             if (value === null || value === nulls.int16)
                 return get_nullstr();
             else {
-                const str = default_formatter.format(value);
+                const str = number_formatter.format(value);
                 return colors ? green(str) : str;
             }
         case DdbType.int:
             if (value === null || value === nulls.int32)
                 return get_nullstr();
             else {
-                const str = default_formatter.format(value);
+                const str = number_formatter.format(value);
                 return colors ? green(str) : str;
             }
         case DdbType.long:
             if (value === null || value === nulls.int64)
                 return get_nullstr();
             else {
-                const str = default_formatter.format(value);
+                const str = number_formatter.format(value);
                 return colors ? green(str) : str;
             }
         case DdbType.date:
@@ -1680,14 +1661,14 @@ export function format(type, value, le, options = {}) {
             if (value === null || value === nulls.float32)
                 return get_nullstr();
             else {
-                const str = formatter.format(value);
+                const str = number_formatter.format(value);
                 return colors ? green(str) : str;
             }
         case DdbType.double:
             if (value === null || value === nulls.double)
                 return get_nullstr();
             else {
-                const str = formatter.format(value);
+                const str = number_formatter.format(value);
                 return colors ? green(str) : str;
             }
         case DdbType.symbol:
@@ -1759,7 +1740,7 @@ export function format(type, value, le, options = {}) {
 }
 /** 格式化向量、集合中的第 index 项为字符串，空值返回 'null' 字符串  formatted vector, the index-th item in the collection is a string, a null value returns a 'null' string */
 export function formati(obj, index, options = {}) {
-    assert(index < obj.rows, 'index < obj.rows');
+    check(index < obj.rows, 'index < obj.rows');
     if (obj.type < 64 || obj.type >= 128) // 普通数组
         switch (obj.type) {
             case DdbType.symbol_extended: {
@@ -1793,6 +1774,8 @@ export function formati(obj, index, options = {}) {
                 const str = (x < 0 ? '-' : '') + (scale ? `${s.slice(0, -scale) || '0'}.${s.slice(-scale)}` : s);
                 return options.colors ? green(str) : str;
             }
+            case DdbType.any:
+                return obj.value[index].toString(options);
             default:
                 return format(obj.type, obj.value[index], obj.le, options);
         }
@@ -2117,7 +2100,7 @@ export class DdbDate extends DdbObj {
 }
 export class DdbBlob extends DdbObj {
     constructor(value) {
-        assert(value, t('new DdbBlob 不能传空的 value'));
+        check(value, t('new DdbBlob 不能传空的 value'));
         super({
             form: DdbForm.scalar,
             type: DdbType.blob,