dolphindb 3.1.19 → 3.1.21

package/browser.d.ts

@@ -180,11 +180,11 @@ export interface InspectOptions {
     /** timestamp 类型转换为字符串表示时显示到秒还是毫秒 */
     timestamp?: 's' | 'ms';
 }
-/** 根据 DdbType 格式化单个元素 (value) 为字符串 */
+/** 根据 DdbType 格式化单个元素 (value) 为字符串，空值根据 nullstr 选项返回 'null' / '' 字符串 */
 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[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbSymbolExtendedValue | string[] | DdbExtObjValue | DdbTensorValue | Uint8Array<ArrayBufferLike> | DdbDecimal128VectorValue | BigInt128Array | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | IotVectorItemValue | DdbArrayVectorValue | DdbDurationVectorValue | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | DdbMatrixValue | DdbChartValue;
 /** 转换一个向量到 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, get_number_formatter } from "./common.js";
+import { ddb_tensor_bytes, DdbChartType, DdbDurationUnit, DdbForm, generate_array_type, DdbFunctionType, DdbType, DdbVoidType, dictables, function_definition_patterns, get_big_int_128, get_time_ddbobj, get_duration_unit, get_type_name, int1282str, ipaddr2str, is_decimal_null_value, is_decimal_type, time_formatters, number_nulls, nulls, set_big_int_128, 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 {
@@ -1566,46 +1566,64 @@ export class DdbObj {
         return obj;
     }
 }
-/** 根据 DdbType 格式化单个元素 (value) 为字符串 */
-export function format(type, value, le, options = {}) {
-    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 ?
-            colors ? grey(str) : str
+const grey_nullstr = grey('null');
+const nullstr = 'null';
+function get_nullstr(options) {
+    return options.nullstr ?
+        options.colors ? grey_nullstr : nullstr
+        :
+            '';
+}
+function format_time(type, value, options) {
+    if (value === null ||
+        value === ((type === DdbType.timestamp ||
+            type === DdbType.nanotime ||
+            type === DdbType.nanotimestamp) ? nulls.int64 : nulls.int32))
+        return get_nullstr(options);
+    let str;
+    // formatter 可能会在 value 不属于 new Date() 有效值时，调用  抛出错误，这里统一处理
+    try {
+        str = time_formatters.get(type)(value, (type === DdbType.timestamp && options.timestamp === 's') ?
+            'YYYY.MM.DD HH:mm:ss'
             :
-                '';
+                undefined);
     }
-    function format_time(formatter, _null) {
-        if (value === null || value === _null)
-            return get_nullstr();
-        let str;
-        // formatter 可能会在 value 不属于 new Date() 有效值时，调用  抛出错误，这里统一处理
-        try {
-            str = formatter(value, (type === DdbType.timestamp && timestamp === 's') ? 'YYYY.MM.DD HH:mm:ss' : undefined);
-        }
-        catch (error) {
-            if (error instanceof RangeError)
-                str = 'Invalid Date';
-            else
-                throw error;
-        }
-        return colors ? magenta(str) : str;
+    catch (error) {
+        if (error instanceof RangeError)
+            str = 'Invalid Date';
+        else
+            throw error;
     }
+    return options.colors ? magenta(str) : str;
+}
+function format_number(type, value, options) {
+    if (value === null || value === number_nulls.get(type))
+        return options.colors ? grey_nullstr : nullstr;
+    const str = get_number_formatter(type === DdbType.int || type === DdbType.long || type === DdbType.short, options.decimals, options.grouping).format(value);
+    return options.colors ? green(str) : str;
+}
+/** 根据 DdbType 格式化单个元素 (value) 为字符串，空值根据 nullstr 选项返回 'null' / '' 字符串 */
+export function format(type, value, le, options = {}) {
     switch (type) {
-        case DdbType.void:
-            return get_nullstr();
+        case DdbType.void: {
+            return options.nullstr ?
+                ''
+                :
+                    value === DdbVoidType.default ?
+                        options.colors ? grey('default') : 'default'
+                        :
+                            options.colors ? grey_nullstr : nullstr;
+        }
         case DdbType.bool:
             if (value === null || value === nulls.int8)
-                return get_nullstr();
+                return get_nullstr(options);
             else {
                 const str = String(Boolean(value));
-                return colors ? blue(str) : str;
+                return options.colors ? blue(str) : str;
             }
         case DdbType.char:
             if (value === null || value === nulls.int8)
-                return get_nullstr();
+                return get_nullstr(options);
             else {
                 let str = 
                 // ascii printable
@@ -1614,101 +1632,63 @@ export function format(type, value, le, options = {}) {
                     String.fromCharCode(value)
                     :
                         '\\' + String(value);
-                if (quote)
+                if (options.quote)
                     str = str.quote();
-                return colors ? green(str) : str;
+                return options.colors ? green(str) : str;
             }
         case DdbType.short:
-            if (value === null || value === nulls.int16)
-                return get_nullstr();
-            else {
-                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 = number_formatter.format(value);
-                return colors ? green(str) : str;
-            }
         case DdbType.long:
-            if (value === null || value === nulls.int64)
-                return get_nullstr();
-            else {
-                const str = number_formatter.format(value);
-                return colors ? green(str) : str;
-            }
+        case DdbType.float:
+        case DdbType.double:
+            return format_number(type, value, options);
         case DdbType.date:
-            return format_time(date2str, nulls.int32);
         case DdbType.month:
-            return format_time(month2str, nulls.int32);
         case DdbType.time:
-            return format_time(time2str, nulls.int32);
         case DdbType.minute:
-            return format_time(minute2str, nulls.int32);
         case DdbType.second:
-            return format_time(second2str, nulls.int32);
         case DdbType.datetime:
-            return format_time(datetime2str, nulls.int32);
         case DdbType.timestamp:
-            return format_time(timestamp2str, nulls.int64);
         case DdbType.nanotime:
-            return format_time(nanotime2str, nulls.int64);
         case DdbType.nanotimestamp:
-            return format_time(nanotimestamp2str, nulls.int64);
-        case DdbType.float:
-            if (value === null || value === nulls.float32)
-                return get_nullstr();
-            else {
-                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 = number_formatter.format(value);
-                return colors ? green(str) : str;
-            }
+        case DdbType.datehour:
+            return format_time(type, value, options);
         case DdbType.symbol:
         case DdbType.string: {
             let str = value;
-            if (quote)
+            if (options.quote)
                 str = str.quote('single');
-            return colors ? cyan(str) : str;
+            return options.colors ? cyan(str) : str;
         }
         case DdbType.uuid: {
             const str = uuid2str(value, le);
-            return colors ? cyan(str) : str;
+            return options.colors ? cyan(str) : str;
         }
         case DdbType.functiondef: {
             const str = value.name.quote('single');
-            return colors ? cyan(str) : str;
+            return options.colors ? cyan(str) : str;
         }
         case DdbType.handle:
         case DdbType.code:
         case DdbType.datasource:
         case DdbType.resource: {
             const str = value.quote('single');
-            return colors ? cyan(str) : str;
+            return options.colors ? cyan(str) : str;
         }
-        case DdbType.datehour:
-            return format_time(datehour2str, nulls.int32);
         case DdbType.ipaddr: {
             const str = ipaddr2str(value, le);
-            return colors ? cyan(str) : str;
+            return options.colors ? cyan(str) : str;
         }
         case DdbType.int128: {
             const str = int1282str(value, le);
-            return colors ? cyan(str) : str;
+            return options.colors ? cyan(str) : str;
         }
         case DdbType.blob: {
             const str = value.length > 100 ?
                 DdbObj.dec.decode(value.subarray(0, 98)) + '…'
                 :
                     DdbObj.dec.decode(value);
-            return colors ? cyan(str) : str;
+            return options.colors ? cyan(str) : str;
         }
         case DdbType.point: {
             const [x, y] = value;
@@ -1721,7 +1701,7 @@ export function format(type, value, le, options = {}) {
         case DdbType.duration: {
             const { data, unit } = value;
             const str = `${data}${DdbDurationUnit[unit] ?? get_duration_unit(unit)}`;
-            return colors ? magenta(str) : str;
+            return options.colors ? magenta(str) : str;
         }
         case DdbType.decimal32:
         case DdbType.decimal64:
@@ -1729,18 +1709,18 @@ export function format(type, value, le, options = {}) {
             const { scale, data } = value;
             if (data === null ||
                 is_decimal_null_value(type, data))
-                return get_nullstr();
+                return get_nullstr(options);
             const s = String(data < 0 ? -data : data).padStart(scale, '0');
             const str = (data < 0 ? '-' : '') + (scale ? `${s.slice(0, -scale) || '0'}.${s.slice(-scale)}` : s);
-            return colors ? green(str) : str;
+            return options.colors ? green(str) : str;
         }
         default:
-            return value === null ? get_nullstr() : String(value);
+            return value === null ? get_nullstr(options) : String(value);
     }
 }
 /** 格式化向量、集合中的第 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 = {}) {
-    check(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: {