dolphindb 2.0.1102 → 2.0.1130

package/browser.d.ts

@@ -3,7 +3,7 @@ import { Lock } from 'xshell/utils.browser.js';
 import { type WebSocketConnectionError } from 'xshell/net.browser.js';
 import { type DdbDecimal128Value, type DdbDecimal128VectorValue } from './data-types/decimal-128.js';
 import type { BigInt128Array } from './shared/bigint-128-array.js';
-import { DdbChartType, DdbDurationUnit, DdbForm, DdbFunctionType, DdbType } from './shared/constants.js';
+import { DdbChartType, DdbDurationUnit, DdbForm, DdbFunctionType, DdbType, DdbVoidType } from './shared/constants.js';
 export * from './shared/constants.js';
 export type { DdbDecimal128Value, DdbDecimal128VectorValue } from './data-types/decimal-128.js';
 export interface DdbFunctionDefValue {
@@ -194,10 +194,10 @@ export interface InspectOptions {
 }
 /** 根据 DdbType 格式化单个元素 (value) 为字符串  Formats a single element (value) as a string according to DdbType, null returns a 'null' string */
 export declare function format(type: DdbType, value: DdbValue, le: boolean, options?: InspectOptions): string;
-/** 格式化向量、集合中的第 index 项为字符串  formatted vector, the index-th item in the collection is a 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 class DdbVoid extends DdbObj<undefined> {
-    constructor();
+    constructor(value?: DdbVoidType);
 }
 export declare class DdbBool extends DdbObj<boolean> {
     constructor(value: boolean | null);
@@ -286,13 +286,13 @@ export declare function second2ms(second: number | null): number | null;
 export declare function second2str(second: number | null, format?: string): string;
 export declare function datetime2ms(datetime: number | null): number | null;
 export declare function datetime2str(datetime: number | null, format?: string): string;
+/** _datetime_formatter.format 会在 date 为 Invalid Date 时抛出错误 */
 export declare function timestamp2ms(timestamp: bigint | null): number | null;
 /** format timestamp (bigint) to string
     - timestamp: bigint value
     - format?:
         格式串，默认是 `YYYY.MM.DD HH:mm:ss.SSS`  format string, default to `YYYY.MM.DD HH:mm:ss.SSS`
-        https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
-*/
+        https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens */
 export declare function timestamp2str(timestamp: bigint | null, format?: string): string;
 export declare function datehour2ms(datehour: number | null): number | null;
 export declare function datehour2str(datehour: number | null, format?: string): string;
@@ -302,8 +302,7 @@ export declare function datehour2str(datehour: number | null, format?: string):
     - 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`
-        https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
-*/
+        https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens */
 export declare function str2timestamp(str: string, format?: string): bigint;
 export declare function nanotime2ns(nanotime: bigint | null): bigint | null;
 export declare function nanotime2str(nanotime: bigint | null, format?: string): string;

package/browser.js

@@ -10,7 +10,7 @@ import { connect_websocket } from 'xshell/net.browser.js';
 import { t } from './i18n/index.js';
 import { DdbDecimal128Serializor } from './data-types/decimal-128.js';
 import { is_decimal_type, is_decimal_null_value, get_duration_unit } from './shared/utils.js';
-import { nulls, DdbChartType, DdbDurationUnit, DdbForm, DdbFunctionType, DdbType } from './shared/constants.js';
+import { nulls, DdbChartType, DdbDurationUnit, DdbForm, DdbFunctionType, DdbType, DdbVoidType } from './shared/constants.js';
 export * from './shared/constants.js';
 /** 可以表示所有 DolphinDB 数据库中的数据类型  Can represent data types in all DolphinDB databases */
 export class DdbObj {
@@ -261,13 +261,12 @@ export class DdbObj {
     }
     static parse_scalar(buf, le, type) {
         switch (type) {
-            case DdbType.void:
-                return [1, null];
             case DdbType.bool: {
                 const dv = new DataView(buf.buffer, buf.byteOffset);
                 const value = dv.getInt8(0);
                 return [1, value === nulls.int8 ? null : Boolean(value)];
             }
+            case DdbType.void:
             case DdbType.char: {
                 const dv = new DataView(buf.buffer, buf.byteOffset);
                 const value = dv.getInt8(0);
@@ -716,10 +715,7 @@ export class DdbObj {
                 case DdbForm.scalar:
                     switch (type) {
                         case DdbType.void:
-                            // Server 实现中区分了 explicitNull
-                            // Void::serialize()
-                            //     isNothing() ? 0 : 1;
-                            return [Uint8Array.of(0)];
+                            return [Uint8Array.of(Number(value))];
                         case DdbType.bool:
                             return [
                                 Int8Array.of(value === null ?
@@ -898,7 +894,6 @@ export class DdbObj {
             case DdbType.void:
                 return [];
             case DdbType.bool:
-                return [value];
             case DdbType.char:
                 return [value];
             case DdbType.short:
@@ -951,7 +946,7 @@ export class DdbObj {
             case DdbType.complex:
             case DdbType.point:
                 return [value];
-            case DdbType.duration:
+            case DdbType.duration: {
                 let bufs = new Int32Array(length * 2);
                 for (let i = 0; i < length; i++) {
                     const { data, unit } = value[i];
@@ -959,6 +954,7 @@ export class DdbObj {
                     bufs[2 * i + 1] = unit;
                 }
                 return [bufs];
+            }
             case DdbType.any: {
                 // [1, 2, 'a', 'aaa']
                 // any[4](<Buffer 
@@ -1298,12 +1294,31 @@ export function format(type, value, le, options = {}) {
         return options.decimals === undefined || options.decimals === null ? default_formatter : _formatter;
     })();
     function get_nullstr() {
+        const str = value === DdbVoidType.default ? 'default' : 'null';
         return nullstr ?
-            colors ? grey('null') : 'null'
+            colors ? grey(str) : str
             :
                 '';
     }
+    function format_time(formatter, _null) {
+        if (value === null || value === _null)
+            return get_nullstr();
+        let str;
+        // formatter 可能会在 value 不属于 new Date() 有效值时，调用  抛出错误，这里统一处理
+        try {
+            str = formatter(value);
+        }
+        catch (error) {
+            if (error instanceof RangeError)
+                str = 'Invalid Date';
+            else
+                throw error;
+        }
+        return colors ? magenta(str) : str;
+    }
     switch (type) {
+        case DdbType.void:
+            return get_nullstr();
         case DdbType.bool:
             if (value === null || value === nulls.int8)
                 return get_nullstr();
@@ -1348,68 +1363,23 @@ export function format(type, value, le, options = {}) {
                 return colors ? green(str) : str;
             }
         case DdbType.date:
-            if (value === null || value === nulls.int32)
-                return get_nullstr();
-            else {
-                const str = date2str(value);
-                return colors ? magenta(str) : str;
-            }
+            return format_time(date2str, nulls.int32);
         case DdbType.month:
-            if (value === null || value === nulls.int32)
-                return get_nullstr();
-            else {
-                const str = month2str(value);
-                return colors ? magenta(str) : str;
-            }
+            return format_time(month2str, nulls.int32);
         case DdbType.time:
-            if (value === null || value === nulls.int32)
-                return get_nullstr();
-            else {
-                const str = time2str(value);
-                return colors ? magenta(str) : str;
-            }
+            return format_time(time2str, nulls.int32);
         case DdbType.minute:
-            if (value === null || value === nulls.int32)
-                return get_nullstr();
-            else {
-                const str = minute2str(value);
-                return colors ? magenta(str) : str;
-            }
+            return format_time(minute2str, nulls.int32);
         case DdbType.second:
-            if (value === null || value === nulls.int32)
-                return get_nullstr();
-            else {
-                const str = second2str(value);
-                return colors ? magenta(str) : str;
-            }
+            return format_time(second2str, nulls.int32);
         case DdbType.datetime:
-            if (value === null || value === nulls.int32)
-                return get_nullstr();
-            else {
-                const str = datetime2str(value);
-                return colors ? magenta(str) : str;
-            }
+            return format_time(datetime2str, nulls.int32);
         case DdbType.timestamp:
-            if (value === null || value === nulls.int64)
-                return get_nullstr();
-            else {
-                const str = timestamp2str(value);
-                return colors ? magenta(str) : str;
-            }
+            return format_time(timestamp2str, nulls.int64);
         case DdbType.nanotime:
-            if (value === null || value === nulls.int64)
-                return get_nullstr();
-            else {
-                const str = nanotime2str(value);
-                return colors ? magenta(str) : str;
-            }
+            return format_time(nanotime2str, nulls.int64);
         case DdbType.nanotimestamp:
-            if (value === null || value === nulls.int64)
-                return get_nullstr();
-            else {
-                const str = nanotimestamp2str(value);
-                return colors ? magenta(str) : str;
-            }
+            return format_time(nanotimestamp2str, nulls.int64);
         case DdbType.float:
             if (value === null || value === nulls.float32)
                 return get_nullstr();
@@ -1447,12 +1417,7 @@ export function format(type, value, le, options = {}) {
             return colors ? cyan(str) : str;
         }
         case DdbType.datehour:
-            if (value === null || value === nulls.int32)
-                return get_nullstr();
-            else {
-                const str = datehour2str(value);
-                return colors ? magenta(str) : str;
-            }
+            return format_time(datehour2str, nulls.int32);
         case DdbType.ipaddr: {
             const str = ipaddr2str(value, le);
             return colors ? cyan(str) : str;
@@ -1496,7 +1461,7 @@ export function format(type, value, le, options = {}) {
             return value === null ? get_nullstr() : String(value);
     }
 }
-/** 格式化向量、集合中的第 index 项为字符串  formatted vector, the index-th item in the collection is a string */
+/** 格式化向量、集合中的第 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');
     if (64 <= obj.type && obj.type < 128) { // array vector
@@ -1600,11 +1565,11 @@ export function formati(obj, index, options = {}) {
     }
 }
 export class DdbVoid extends DdbObj {
-    constructor() {
+    constructor(value = DdbVoidType.undefined) {
         super({
             form: DdbForm.scalar,
             type: DdbType.void,
-            value: null,
+            value,
         });
     }
 }
@@ -2002,6 +1967,7 @@ export function datetime2str(datetime, format = 'YYYY.MM.DD HH:mm:ss') {
         :
             dayjs(datetime2ms(datetime)).format(format);
 }
+/** _datetime_formatter.format 会在 date 为 Invalid Date 时抛出错误 */
 export function timestamp2ms(timestamp) {
     if (timestamp === null || timestamp === nulls.int64)
         return null;
@@ -2012,8 +1978,7 @@ export function timestamp2ms(timestamp) {
     - timestamp: bigint value
     - format?:
         格式串，默认是 `YYYY.MM.DD HH:mm:ss.SSS`  format string, default to `YYYY.MM.DD HH:mm:ss.SSS`
-        https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
-*/
+        https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens */
 export function timestamp2str(timestamp, format = 'YYYY.MM.DD HH:mm:ss.SSS') {
     return (timestamp === null || timestamp === nulls.int64) ?
         'null'
@@ -2038,8 +2003,7 @@ export function datehour2str(datehour, format = 'YYYY.MM.DDTHH') {
     - 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`
-        https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
-*/
+        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') {
     if (!str || str === 'null')
         return nulls.int64;