dolphindb 2.0.1103 → 3.0.0

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 {
@@ -197,7 +197,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);

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:
@@ -1280,7 +1275,7 @@ let _grouping = true;
 /** 缓存，为了优化性能，通常 options.decimals 都是不变的  Cache, in order to optimize performance, usually options.decimals are unchanged */
 let _formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
 /** 用来处理时差  To deal with jet lag */
-let _datetime_formatter = new Intl.DateTimeFormat('zh-CN', { dateStyle: 'short', timeStyle: 'medium', timeZone: 'UTC' });
+let _datetime_formatter = new Intl.DateTimeFormat('zh-CN', { dateStyle: 'short', timeStyle: 'medium', timeZone: 'UTC', hour12: false });
 /** 根据 DdbType 格式化单个元素 (value) 为字符串  Formats a single element (value) as a string according to DdbType, null returns a 'null' string */
 export function format(type, value, le, options = {}) {
     const { nullstr = false, colors = false, quote = false, grouping = true } = options;
@@ -1299,8 +1294,9 @@ 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
             :
                 '';
     }
@@ -1321,6 +1317,8 @@ export function format(type, value, le, options = {}) {
         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();
@@ -1567,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,
         });
     }
 }