dolphindb 2.0.1008 → 2.0.1010

package/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 import type { InspectOptions as UtilInspectOptions } from 'util';
-import { inspect, WebSocket, Lock, type WebSocketConnectionError } from 'xshell';
+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';
@@ -152,7 +152,7 @@ export declare class DdbObj<TValue extends DdbValue = DdbValue> {
     ];
     pack(): Uint8Array;
     static pack_vector_body(value: DdbVectorValue, type: DdbType, length: number): ArrayBufferView[];
-    [inspect.custom](depth: number, _options: InspectOptions, _inspect: any): string;
+    [inspect.custom](depth: number, _options: InspectOptions, _inspect: any): string | TValue;
     inspect_type(): string;
     /** 自动转换 js string, boolean 为 DdbObj */
     static to_ddbobj(value: DdbObj | string | boolean): DdbObj;

package/index.js

@@ -4,7 +4,7 @@ import DayjsCustomParseFormat from 'dayjs/plugin/customParseFormat.js';
 dayjs.extend(DayjsCustomParseFormat);
 import ipaddrjs from 'ipaddr.js';
 const { fromByteArray: buf2ipaddr } = ipaddrjs;
-import { concat, assert, inspect, typed_array_to_buffer, connect_websocket, WebSocket, Lock, genid } from 'xshell';
+import { concat, assert, inspect, typed_array_to_buffer, connect_websocket, Lock, genid, WebSocketOpen, WebSocketClosed, WebSocketClosing } from 'xshell';
 import { t } from './i18n/index.js';
 import { DdbDecimal128Serializor } from './data-types/decimal-128.js';
 import { BigInt128Array } from './shared/bigint-128-array.js';
@@ -995,7 +995,11 @@ export class DdbObj {
         const data = (() => {
             switch (this.form) {
                 case DdbForm.scalar:
-                    return format(this.type, this.value, this.le, options);
+                    // 如果类型为 string, 则不进行格式化处理
+                    if (this.type === DdbType.string)
+                        return this.value;
+                    else
+                        return format(this.type, this.value, this.le, options);
                 case DdbForm.vector:
                 case DdbForm.pair:
                 case DdbForm.set: {
@@ -1121,7 +1125,11 @@ export class DdbObj {
                 return inspect(typed_array_to_buffer(this.value), options);
             return inspect(this.value, options);
         })();
-        return `${options.colors ? type.blue : type}(${this.name ? `${inspect(this.name, options)}, ` : ''}${data})`;
+        // 如果类型为 string 则不需要加上类型名
+        if (this.form === DdbForm.scalar && this.type === DdbType.string)
+            return data;
+        else
+            return `${options.colors ? type.blue : type}(${this.name ? `${inspect(this.name, options)}, ` : ''}${data})`;
     }
     inspect_type() {
         const tname = DdbType[this.type];
@@ -2164,10 +2172,10 @@ export class DDB {
     /** 首次定义 pnode_run 的 promise，保证并发调用 rpc 时只定义一次 pnode_run */
     ppnode_run;
     get connected() {
-        return !this.error && this.lwebsocket.resource?.readyState === WebSocket.OPEN;
+        return !this.error && this.lwebsocket.resource?.readyState === WebSocketOpen;
     }
     get errored() {
-        return Boolean(this.error || (this.lwebsocket.resource && this.lwebsocket.resource.readyState !== WebSocket.OPEN));
+        return Boolean(this.error || (this.lwebsocket.resource && this.lwebsocket.resource.readyState !== WebSocketOpen));
     }
     /**
         使用 WebSocket URL 初始化连接到 DolphinDB 的实例（不建立实际的网络连接）
@@ -2312,7 +2320,7 @@ export class DDB {
         const { resource } = this.lwebsocket;
         if (resource) {
             const { readyState } = resource;
-            if (readyState !== WebSocket.CLOSED && readyState !== WebSocket.CLOSING)
+            if (readyState !== WebSocketClosed && readyState !== WebSocketClosing)
                 // 这里不获取 lock，直接关闭连接
                 resource.close(1000);
         }