dolphindb 2.0.905 → 2.0.907

package/index.d.ts

@@ -399,10 +399,11 @@ export declare function nanotimestamp2str(nanotimestamp: bigint | null, format?:
     - str: nano timestamp string, 如果为空字符串或 'null' 会返回对应的空值 (nulls.int64)
         nano timestamp string, If it is an empty string or 'null', it will return the corresponding empty value (nulls.int64)
     - format?:
-        对应传入字符串的格式串，默认是 `YYYY.MM.DD HH:mm:ss.SSSSSSSSS`  The format string corresponding to the incoming string, the default is `YYYY.MM.DD HH:mm:ss.SSSSSSSSS`
-        秒的格式为 ss (必须包含); 纳秒的格式为 SSSSSSSSS (必须包含)  Seconds are in the format ss (must be included); nanoseconds are in the format SSSSSSSSS (must be included)
+        对应传入字符串的格式串，默认是 `YYYY.MM.DD HH:mm:ss.SSSSSSSSS`
+        秒的格式为 ss (必须包含); 纳秒的格式为 SSSSSSSSS (必须包含)
         https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
-*/
+        The format string corresponding to the incoming string, the default is `YYYY.MM.DD HH:mm:ss.SSSSSSSSS`
+        Seconds are in the format ss (must be included); nanoseconds are in the format SSSSSSSSS (must be included) */
 export declare function str2nanotimestamp(str: string, format?: string): bigint;
 export declare function ipaddr2str(buffer: Uint8Array, le?: boolean, ipv6?: boolean): string;
 export declare function uuid2str(buffer: Uint8Array, le?: boolean): string;
@@ -413,10 +414,8 @@ export interface StreamingParams {
     handler(message: StreamingData): any;
 }
 export interface StreamingData extends StreamingParams {
-    /**
-        server 发送消息的时间 (nano seconds since epoch)  The time the server sent the message (nano seconds since epoch)
-        std::chrono::system_clock::now().time_since_epoch() / std::chrono::nanoseconds(1)
-    */
+    /** server 发送消息的时间 (nano seconds since epoch)   The time the server sent the message (nano seconds since epoch)
+        std::chrono::system_clock::now().time_since_epoch() / std::chrono::nanoseconds(1) */
     time: bigint;
     /** message id */
     id: bigint;
@@ -462,11 +461,11 @@ export declare class DDB {
     le: boolean;
     /** little endian (client) */
     static le_client: boolean;
-    /** 是否在建立连接后自动登录，默认 true */
+    /** 是否在建立连接后自动登录，默认 true  Whether to automatically log in after the connection is established, the default is true */
     autologin: boolean;
-    /** DolphinDB 登录用户名 */
+    /** DolphinDB 登录用户名  DolphinDB username */
     username: string;
-    /** DolphinDB 登录密码 */
+    /** DolphinDB 登录密码  DolphinDB password */
     password: string;
     /** python session flag (2048) */
     python: boolean;
@@ -514,7 +513,7 @@ export declare class DDB {
     });
     private on_message;
     /** 建立实际的 WebSocket 连接到 URL 对应的 DolphinDB  Establish a actual websocket connection to the DolphindB corresponding to the URL
-        是幂等的，调用后会确保已连接到数据库 (确保 websocket.readyState 为 open)，否则报错  It is a power, and after calling, it will ensure that it has been connected to the database (ensure that websocket.ReadyState is open), otherwise an error will be reported
+        是幂等的，调用后会确保已连接到数据库 (确保 websocket.readyState 为 open)，否则报错  After calling, it will ensure that it has been connected to the database (ensure that websocket.ReadyState is open), otherwise an error will be reported
         this.autologin 为 true 时自动登录  this.autologin automatically log in when it is true */
     connect(): Promise<void>;
     get_rpc_options({ urgent, secondary, async: _async, pickle, clear, api, compress, cancellable, priority, parallelism, root_id, limit, }?: {

package/index.js

@@ -1082,34 +1082,51 @@ export class DdbObj {
                         // append!(av, [1..500])
                         // ...
                         // av
-                        const _type = this.type - 64;
+                        const type_ = this.type - 64;
                         const limit = 10;
-                        let items = new Array(Math.min(limit, this.rows));
+                        let array_items = new Array(Math.min(limit, this.rows));
                         let i_items = 0;
                         for (const { lengths, data } of this.value) {
                             let acc_len = 0;
                             for (const length of lengths) {
-                                let _items = new Array(Math.min(limit, length));
-                                for (let i = 0; i < _items.length; i++)
-                                    if (_type === DdbType.decimal32 || _type === DdbType.decimal64) {
-                                        const x = data[acc_len + i];
-                                        if (x === nulls.int64 && _type === DdbType.decimal64 ||
-                                            x === nulls.int32 && _type === DdbType.decimal32)
-                                            return '';
-                                        const { scale } = this.value;
-                                        const s = String(x < 0 ? -x : x).padStart(scale, '0');
-                                        const str = (x < 0 ? '-' : '') + (scale ? `${s.slice(0, -scale) || '0'}.${s.slice(-scale)}` : s);
-                                        _items[i] = options.colors ? str.green : str;
+                                let items = new Array(Math.min(limit, length));
+                                for (let i = 0; i < items.length; i++)
+                                    switch (type_) {
+                                        case DdbType.decimal32:
+                                        case DdbType.decimal64:
+                                            const x = data[acc_len + i];
+                                            if (x === nulls.int64 /* && _type === DdbType.decimal64 一定成立 */ ||
+                                                x === nulls.int32 && type_ === DdbType.decimal32)
+                                                return '';
+                                            const { scale } = this.value;
+                                            const s = String(x < 0 ? -x : x).padStart(scale, '0');
+                                            const str = (x < 0 ? '-' : '') + (scale ? `${s.slice(0, -scale) || '0'}.${s.slice(-scale)}` : s);
+                                            items[i] = options.colors ? str.green : str;
+                                            break;
+                                        case DdbType.complex:
+                                        case DdbType.point: {
+                                            const index = acc_len + i;
+                                            items[i] = format(type_, data.subarray(2 * index, 2 * (index + 1)), this.le, options);
+                                            break;
+                                        }
+                                        case DdbType.uuid:
+                                        case DdbType.int128:
+                                        case DdbType.ipaddr: {
+                                            const index = acc_len + i;
+                                            items[i] = format(type_, data.subarray(16 * index, 16 * (index + 1)), this.le, options);
+                                            break;
+                                        }
+                                        default:
+                                            items[i] = format(type_, data[acc_len + i], this.le, options);
+                                            break;
                                     }
-                                    else
-                                        _items[i] = format(_type, data[acc_len + i], this.le, options);
-                                items[i_items++] = format_array(_items, length > limit);
+                                array_items[i_items++] = format_array(items, length > limit);
                                 acc_len += length;
                             }
                             if (i_items >= limit)
                                 break;
                         }
-                        return format_array(items, this.rows > limit);
+                        return format_array(array_items, this.rows > limit);
                     }
                     switch (this.type) {
                         case DdbType.symbol_extended: {
@@ -1482,7 +1499,7 @@ export function formati(obj, index, options = {}) {
         // append!(av, [1..500])
         // ...
         // av
-        const _type = obj.type - 64;
+        const type_ = obj.type - 64;
         let offset = 0;
         for (const { lengths, data, rows } of obj.value) {
             let acc_len = 0;
@@ -1499,18 +1516,35 @@ export function formati(obj, index, options = {}) {
                 const limit = 10;
                 let items = new Array(Math.min(limit, length));
                 for (let i = 0; i < items.length; i++)
-                    if (_type === DdbType.decimal32 || _type === DdbType.decimal64) {
-                        const x = data[acc_len + i];
-                        if (x === nulls.int64 && _type === DdbType.decimal64 ||
-                            x === nulls.int32 && _type === DdbType.decimal32)
-                            return '';
-                        const { scale } = obj.value;
-                        const s = String(x < 0 ? -x : x).padStart(scale, '0');
-                        const str = (x < 0 ? '-' : '') + (scale ? `${s.slice(0, -scale) || '0'}.${s.slice(-scale)}` : s);
-                        items[i] = options.colors ? str.green : str;
+                    switch (type_) {
+                        case DdbType.decimal32:
+                        case DdbType.decimal64:
+                            const x = data[acc_len + i];
+                            if (x === nulls.int64 /* && _type === DdbType.decimal64 一定成立 */ ||
+                                x === nulls.int32 && type_ === DdbType.decimal32)
+                                return '';
+                            const { scale } = obj.value;
+                            const s = String(x < 0 ? -x : x).padStart(scale, '0');
+                            const str = (x < 0 ? '-' : '') + (scale ? `${s.slice(0, -scale) || '0'}.${s.slice(-scale)}` : s);
+                            items[i] = options.colors ? str.green : str;
+                            break;
+                        case DdbType.complex:
+                        case DdbType.point: {
+                            const index = acc_len + i;
+                            items[i] = format(type_, data.subarray(2 * index, 2 * (index + 1)), obj.le, options);
+                            break;
+                        }
+                        case DdbType.uuid:
+                        case DdbType.int128:
+                        case DdbType.ipaddr: {
+                            const index = acc_len + i;
+                            items[i] = format(type_, data.subarray(16 * index, 16 * (index + 1)), obj.le, options);
+                            break;
+                        }
+                        default:
+                            items[i] = format(type_, data[acc_len + i], obj.le, options);
+                            break;
                     }
-                    else
-                        items[i] = format(_type, data[acc_len + i], obj.le, options);
                 return (items.join(', ') + (length > limit ? ', ...' : '')).bracket('square');
             }
         }
@@ -1848,15 +1882,14 @@ export function date2ms(date) {
     // 将 server 的本地时间 (以 ms 为单位，1970.01.01 00:00:00 作为零点) 当成是客户端这里的本地的时间，然后根据本地的时区信息转换为 utc 时间
     // 本地的时区与实际的时间值相关，timezone offset 可能会受到夏令时 (DST) 的影响
     // 得到的 utc 毫秒数交给 js date 或者 dayjs 去格式化
+    if (date === null || date === nulls.int32)
+        return null;
     const ms = 1000 * 3600 * 24 * date;
-    return (date === null || date === nulls.int32) ?
-        null
-        :
-            1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
 }
 export function date2str(date, format = 'YYYY.MM.DD') {
     return (date === null || date === nulls.int32) ?
-        null
+        'null'
         :
             dayjs(date2ms(date)).format(format);
 }
@@ -1883,16 +1916,15 @@ export function time2ms(time) {
 }
 export function time2str(time, format = 'HH:mm:ss.SSS') {
     return (time === null || time === nulls.int32) ?
-        null
+        'null'
         :
             dayjs(time2ms(time)).format(format);
 }
 export function minute2ms(minute) {
+    if (minute === null || minute === nulls.int32)
+        return null;
     const ms = 60 * 1000 * minute;
-    return (minute === null || minute === nulls.int32) ?
-        null
-        :
-            1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
 }
 export function minute2str(minute, format = 'HH:mm[m]') {
     return (minute === null || minute === nulls.int32) ?
@@ -1901,11 +1933,10 @@ export function minute2str(minute, format = 'HH:mm[m]') {
             dayjs(minute2ms(minute)).format(format);
 }
 export function second2ms(second) {
+    if (second === null || second === nulls.int32)
+        return null;
     const ms = 1000 * second;
-    return (second === null || second === nulls.int32) ?
-        null
-        :
-            1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
 }
 export function second2str(second, format = 'HH:mm:ss') {
     return (second === null || second === nulls.int32) ?
@@ -1914,11 +1945,10 @@ export function second2str(second, format = 'HH:mm:ss') {
             dayjs(second2ms(second)).format(format);
 }
 export function datetime2ms(datetime) {
+    if (datetime === null || datetime === nulls.int32)
+        return null;
     const ms = 1000 * datetime;
-    return (datetime === null || datetime === nulls.int32) ?
-        null
-        :
-            1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
 }
 export function datetime2str(datetime, format = 'YYYY.MM.DD HH:mm:ss') {
     return (datetime === null || datetime === nulls.int32) ?
@@ -1927,11 +1957,10 @@ export function datetime2str(datetime, format = 'YYYY.MM.DD HH:mm:ss') {
             dayjs(datetime2ms(datetime)).format(format);
 }
 export function timestamp2ms(timestamp) {
+    if (timestamp === null || timestamp === nulls.int64)
+        return null;
     const ms = Number(timestamp);
-    return (timestamp === null || timestamp === nulls.int64) ?
-        null
-        :
-            1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
 }
 /** format timestamp (bigint) to string
     - timestamp: bigint value
@@ -1946,18 +1975,16 @@ export function timestamp2str(timestamp, format = 'YYYY.MM.DD HH:mm:ss.SSS') {
             dayjs(timestamp2ms(timestamp)).format(format);
 }
 export function datehour2ms(datehour) {
+    if (datehour === null || datehour === nulls.int32)
+        return null;
     const ms = 1000 * 3600 * datehour;
-    return (datehour === null || datehour === nulls.int32) ?
-        null
-        :
-            1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
 }
 export function datehour2str(datehour, format = 'YYYY.MM.DDTHH') {
+    if (datehour === null || datehour === nulls.int32)
+        return 'null';
     const ms = 1000 * 3600 * datehour;
-    return (datehour === null || datehour === nulls.int32) ?
-        'null'
-        :
-            dayjs(1000 * 60 * new Date(ms).getTimezoneOffset() + ms).format(format);
+    return dayjs(1000 * 60 * new Date(ms).getTimezoneOffset() + ms).format(format);
 }
 /** parse timestamp string to bigint value
     - str: timestamp string, 如果为空字符串或 'null' 会返回对应的空值 (nulls.int64)
@@ -1994,11 +2021,10 @@ export function nanotime2str(nanotime, format = 'HH:mm:ss.SSSSSSSSS') {
         String(nanotime % 1000000000n).padStart(9, '0'));
 }
 export function nanotimestamp2ns(nanotimestamp) {
+    if (nanotimestamp === null || nanotimestamp === nulls.int64)
+        return null;
     const ms = Number(nanotimestamp / 1000000n);
-    return (nanotimestamp === null || nanotimestamp === nulls.int64) ?
-        null
-        :
-            BigInt(1000 * 60 * new Date(ms).getTimezoneOffset()) * 1000000n + nanotimestamp;
+    return BigInt(1000 * 60 * new Date(ms).getTimezoneOffset()) * 1000000n + nanotimestamp;
 }
 /** format nanotimestamp value (bigint) to string
     - nanotimestamp: bigint value
@@ -2037,10 +2063,11 @@ export function nanotimestamp2str(nanotimestamp, format = 'YYYY.MM.DD HH:mm:ss.S
     - str: nano timestamp string, 如果为空字符串或 'null' 会返回对应的空值 (nulls.int64)
         nano timestamp string, If it is an empty string or 'null', it will return the corresponding empty value (nulls.int64)
     - format?:
-        对应传入字符串的格式串，默认是 `YYYY.MM.DD HH:mm:ss.SSSSSSSSS`  The format string corresponding to the incoming string, the default is `YYYY.MM.DD HH:mm:ss.SSSSSSSSS`
-        秒的格式为 ss (必须包含); 纳秒的格式为 SSSSSSSSS (必须包含)  Seconds are in the format ss (must be included); nanoseconds are in the format SSSSSSSSS (must be included)
+        对应传入字符串的格式串，默认是 `YYYY.MM.DD HH:mm:ss.SSSSSSSSS`
+        秒的格式为 ss (必须包含); 纳秒的格式为 SSSSSSSSS (必须包含)
         https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
-*/
+        The format string corresponding to the incoming string, the default is `YYYY.MM.DD HH:mm:ss.SSSSSSSSS`
+        Seconds are in the format ss (must be included); nanoseconds are in the format SSSSSSSSS (must be included) */
 export function str2nanotimestamp(str, format = 'YYYY.MM.DD HH:mm:ss.SSSSSSSSS') {
     if (!str || str === 'null')
         return nulls.int64;
@@ -2106,11 +2133,11 @@ export class DDB {
     le = true;
     /** little endian (client) */
     static le_client = Boolean(new Uint8Array(Uint32Array.of(1).buffer)[0]);
-    /** 是否在建立连接后自动登录，默认 true */
+    /** 是否在建立连接后自动登录，默认 true  Whether to automatically log in after the connection is established, the default is true */
     autologin = true;
-    /** DolphinDB 登录用户名 */
+    /** DolphinDB 登录用户名  DolphinDB username */
     username = 'admin';
-    /** DolphinDB 登录密码 */
+    /** DolphinDB 登录密码  DolphinDB password */
     password = '123456';
     /** python session flag (2048) */
     python = false;
@@ -2169,7 +2196,7 @@ export class DDB {
         // 这里的实现一定会被 connect 中的实现覆盖
     }
     /** 建立实际的 WebSocket 连接到 URL 对应的 DolphinDB  Establish a actual websocket connection to the DolphindB corresponding to the URL
-        是幂等的，调用后会确保已连接到数据库 (确保 websocket.readyState 为 open)，否则报错  It is a power, and after calling, it will ensure that it has been connected to the database (ensure that websocket.ReadyState is open), otherwise an error will be reported
+        是幂等的，调用后会确保已连接到数据库 (确保 websocket.readyState 为 open)，否则报错  After calling, it will ensure that it has been connected to the database (ensure that websocket.ReadyState is open), otherwise an error will be reported
         this.autologin 为 true 时自动登录  this.autologin automatically log in when it is true */
     async connect() {
         if (this.connected)