dolphindb 2.0.1102 → 2.0.1130

package/index.d.ts

@@ -3,7 +3,7 @@ import type { InspectOptions as UtilInspectOptions } from 'util';
 import { inspect, Lock, type WebSocket, type WebSocketConnectionError } from 'xshell';
 import { type DdbDecimal128Value, type DdbDecimal128VectorValue } from './data-types/decimal-128.js';
 import { 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 {
@@ -188,7 +188,7 @@ export declare function format(type: DdbType, value: DdbValue, le: boolean, opti
 /** 格式化向量、集合中的第 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);
@@ -277,13 +277,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;
@@ -293,8 +293,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/index.js

@@ -9,7 +9,7 @@ import { t } from './i18n/index.js';
 import { DdbDecimal128Serializor } from './data-types/decimal-128.js';
 import { BigInt128Array } from './shared/bigint-128-array.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';
 // Simulate other TypedArray behavior in nodejs
 BigInt128Array.prototype[inspect.custom] = function () {
@@ -268,13 +268,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);
@@ -723,10 +722,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 ?
@@ -905,7 +901,6 @@ export class DdbObj {
             case DdbType.void:
                 return [];
             case DdbType.bool:
-                return [value];
             case DdbType.char:
                 return [value];
             case DdbType.short:
@@ -1299,7 +1294,27 @@ export function format(type, value, le, options = {}) {
         }
         return options.decimals === undefined || options.decimals === null ? default_formatter : _formatter;
     })();
+    function format_time(formatter, _null) {
+        if (value === null || value === _null)
+            return inspect(null, options);
+        let str;
+        // formatter 可能会在 value 不属于 new Date() 有效值时，调用  抛出错误，这里统一处理
+        try {
+            str = formatter(value);
+        }
+        catch (error) {
+            if (error instanceof RangeError)
+                str = 'Invalid Date';
+            else
+                throw error;
+        }
+        return options.colors ? str.magenta : str;
+    }
     switch (type) {
+        case DdbType.void: {
+            const str = value === DdbVoidType.default ? 'default' : 'null';
+            return options.colors ? str.grey : str;
+        }
         case DdbType.bool:
             return inspect((value === null || value === nulls.int8) ?
                 null
@@ -1340,77 +1355,23 @@ export function format(type, value, le, options = {}) {
                         :
                             default_formatter.format(value);
         case DdbType.date:
-            return (value === null || value === nulls.int32) ?
-                inspect(null, options)
-                :
-                    options.colors ?
-                        date2str(value).magenta
-                        :
-                            date2str(value);
+            return format_time(date2str, nulls.int32);
         case DdbType.month:
-            return (value === null || value === nulls.int32) ?
-                inspect(null, options)
-                :
-                    options.colors ?
-                        month2str(value).magenta
-                        :
-                            month2str(value);
+            return format_time(month2str, nulls.int32);
         case DdbType.time:
-            return (value === null || value === nulls.int32) ?
-                inspect(null, options)
-                :
-                    options.colors ?
-                        time2str(value).magenta
-                        :
-                            time2str(value);
+            return format_time(time2str, nulls.int32);
         case DdbType.minute:
-            return (value === null || value === nulls.int32) ?
-                inspect(null, options)
-                :
-                    options.colors ?
-                        minute2str(value).magenta
-                        :
-                            minute2str(value);
+            return format_time(minute2str, nulls.int32);
         case DdbType.second:
-            return (value === null || value === nulls.int32) ?
-                inspect(null, options)
-                :
-                    options.colors ?
-                        second2str(value).magenta
-                        :
-                            second2str(value);
+            return format_time(second2str, nulls.int32);
         case DdbType.datetime:
-            return (value === null || value === nulls.int32) ?
-                inspect(null, options)
-                :
-                    options.colors ?
-                        datetime2str(value).magenta
-                        :
-                            datetime2str(value);
+            return format_time(datetime2str, nulls.int32);
         case DdbType.timestamp:
-            return (value === null || value === nulls.int64) ?
-                inspect(null, options)
-                :
-                    options.colors ?
-                        timestamp2str(value).magenta
-                        :
-                            timestamp2str(value);
+            return format_time(timestamp2str, nulls.int64);
         case DdbType.nanotime:
-            return (value === null || value === nulls.int64) ?
-                inspect(null, options)
-                :
-                    options.colors ?
-                        nanotime2str(value).magenta
-                        :
-                            nanotime2str(value);
+            return format_time(nanotime2str, nulls.int64);
         case DdbType.nanotimestamp:
-            return (value === null || value === nulls.int64) ?
-                inspect(null, options)
-                :
-                    options.colors ?
-                        nanotimestamp2str(value).magenta
-                        :
-                            nanotimestamp2str(value);
+            return format_time(nanotimestamp2str, nulls.int64);
         case DdbType.float:
             return (value === null || value === nulls.float32) ?
                 inspect(null, options)
@@ -1443,13 +1404,7 @@ export function format(type, value, le, options = {}) {
         case DdbType.resource:
             return inspect(value, options);
         case DdbType.datehour:
-            return (value === null || value === nulls.int32) ?
-                'null'
-                :
-                    options.colors ?
-                        datehour2str(value).magenta
-                        :
-                            datehour2str(value);
+            return format_time(datehour2str, nulls.int32);
         case DdbType.ipaddr:
             return options.colors ?
                 ipaddr2str(value, le).cyan
@@ -1596,11 +1551,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,
         });
     }
 }
@@ -1998,6 +1953,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;
@@ -2008,8 +1964,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'
@@ -2034,8 +1989,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;