dolphindb 2.0.905 → 2.0.907

package/browser.d.ts

@@ -386,7 +386,8 @@ export declare function datehour2str(datehour: number | null, format?: string):
     - str: timestamp string, 如果为空字符串或 'null' 会返回对应的空值 (nulls.int64)
         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.SSS`  The format string corresponding to the incoming string, the default is `YYYY.MM.DD HH:mm:ss.SSS`
+        对应传入字符串的格式串，默认是 `YYYY.MM.DD HH:mm:ss.SSS`
+        The format string corresponding to the incoming string, the default is `YYYY.MM.DD HH:mm:ss.SSS`
         https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
 */
 export declare function str2timestamp(str: string, format?: string): bigint;
@@ -443,7 +444,8 @@ export interface StreamingData extends StreamingParams {
         /** 每次接收到的 data 组成的数组  An array of data received each time */
         segments: DdbObj<DdbVectorObj[]>[];
     };
-    /** 成功订阅后，后续推送过来的 message 解析错误，则会设置 error 并调用 handler  After successfully subscribed, if the subsequently pushed message is parsed incorrectly, the error will be set and the handler will be called. */
+    /** 成功订阅后，后续推送过来的 message 解析错误，则会设置 error 并调用 handler
+        After successfully subscribed, if the subsequently pushed message is parsed incorrectly, the error will be set and the handler will be called. */
     error?: Error;
 }
 export declare const winsize: 100000;

package/browser.js

@@ -1080,34 +1080,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 ? green(str) : 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 ? green(str) : 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: {
@@ -1493,7 +1510,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;
@@ -1510,18 +1527,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 ? green(str) : 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 ? green(str) : 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');
             }
         }
@@ -1861,15 +1895,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);
 }
@@ -1896,16 +1929,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) ?
@@ -1914,11 +1946,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) ?
@@ -1927,11 +1958,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) ?
@@ -1940,11 +1970,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
@@ -1959,24 +1988,23 @@ 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)
         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.SSS`  The format string corresponding to the incoming string, the default is `YYYY.MM.DD HH:mm:ss.SSS`
+        对应传入字符串的格式串，默认是 `YYYY.MM.DD HH:mm:ss.SSS`
+        The format string corresponding to the incoming string, the default is `YYYY.MM.DD HH:mm:ss.SSS`
         https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
 */
 export function str2timestamp(str, format = 'YYYY.MM.DD HH:mm:ss.SSS') {
@@ -2006,11 +2034,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