dolphindb 2.0.527 → 2.0.530

package/browser.d.ts

@@ -126,8 +126,8 @@ export interface DdbChartValue {
         x_axis: string;
         y_axis: string;
     };
-    extras: {
-        multi_y_axis: boolean;
+    extras?: {
+        multi_y_axes: boolean;
     };
     data: DdbObj<DdbMatrixValue>;
 }
@@ -206,7 +206,8 @@ export declare class DdbObj<T extends DdbValue = DdbValue> {
     ];
     pack(): Uint8Array;
     static pack_vector_body(value: DdbVectorValue, type: DdbType, length: number): ArrayBufferView[];
-    toString(): any;
+    toString(colors?: boolean): any;
+    inspect_type(): string;
     /** 自动转换 js string, boolean 为 DdbObj */
     static to_ddbobj(value: DdbObj | string | boolean): DdbObj;
     /** 转换 js 数组为 DdbObj[] */

package/browser.js

@@ -4,6 +4,7 @@ dayjs.extend(DayjsCustomParseFormat);
 import ipaddrjs from 'ipaddr.js';
 const { fromByteArray: buf2ipaddr } = ipaddrjs;
 import 'xshell/prototype.browser.js';
+import { blue } from 'xshell/chalk.browser.js';
 import { concat } from 'xshell/utils.browser.js';
 import { connect_websocket } from 'xshell/net.browser.js';
 export var DdbForm;
@@ -269,7 +270,6 @@ export class DdbObj {
                 else {
                     const { chartType: type, stacking, title: titles, extras, data, ...others } = dict.to_dict();
                     const [chart, x_axis, y_axis] = titles.value;
-                    const { multiYAxes: multi_y_axis, ...extras_others } = extras.to_dict({ strip: true });
                     dict.form = DdbForm.chart;
                     dict.value = {
                         type: type.value,
@@ -279,10 +279,15 @@ export class DdbObj {
                             x_axis,
                             y_axis,
                         },
-                        extras: {
-                            multi_y_axis,
-                            ...extras_others,
-                        },
+                        ...extras ? (() => {
+                            const { multiYAxes: multi_y_axes = false, ...extras_others } = extras.to_dict({ strip: true });
+                            return {
+                                extras: {
+                                    multi_y_axes,
+                                    ...extras_others,
+                                }
+                            };
+                        })() : {},
                         data,
                         ...others,
                     };
@@ -858,15 +863,20 @@ export class DdbObj {
                         value[1].pack(),
                     ];
                 case DdbForm.chart: {
-                    const { type, stacking, titles: { chart, x_axis, y_axis, }, extras: { multi_y_axis, ...extras_other }, data } = this.value;
+                    const { type, stacking, titles: { chart, x_axis, y_axis, }, extras, data } = this.value;
                     const { value: [keys, values] } = new DdbDict({
                         chartType: new DdbInt(type),
                         stacking,
                         title: new DdbVectorString([chart, x_axis, y_axis]),
-                        extras: new DdbDict({
-                            multiYAxis: multi_y_axis,
-                            ...extras_other
-                        }),
+                        ...extras ? (() => {
+                            const { multi_y_axes, ...extras_other } = extras;
+                            return {
+                                extras: new DdbDict({
+                                    multiYAxes: multi_y_axes,
+                                    ...extras_other
+                                })
+                            };
+                        })() : {},
                         data,
                     });
                     return [
@@ -979,34 +989,8 @@ export class DdbObj {
                 throw new Error(`vector ${DdbType[type]} 暂不支持序列化`);
         }
     }
-    toString() {
-        const type = (() => {
-            const tname = DdbType[this.type];
-            switch (this.form) {
-                case DdbForm.scalar:
-                    if (this.type === DdbType.functiondef)
-                        return `functiondef<${DdbFunctionType[this.value.type]}>`;
-                    return tname;
-                case DdbForm.vector:
-                    if (64 <= this.type && this.type < 128)
-                        return `${DdbType[this.type - 64]}[][${this.rows}]`;
-                    return `${tname}[${this.rows}]`;
-                case DdbForm.pair:
-                    return `pair<${tname}>`;
-                case DdbForm.set:
-                    return `set<${tname}>[${this.rows}]`;
-                case DdbForm.table:
-                    return `table[${this.rows}r][${this.cols}c]`;
-                case DdbForm.dict:
-                    return `dict<${DdbType[this.value[0].type]}, ${DdbType[this.value[1].type]}>`;
-                case DdbForm.chart:
-                    return `chart<${DdbChartType[this.value.type]}>`;
-                case DdbForm.matrix:
-                    return `matrix<${tname}>[${this.rows}r][${this.cols}c]`;
-                default:
-                    return `${DdbForm[this.form]} ${tname}`;
-            }
-        })();
+    toString(colors = false) {
+        const type = this.inspect_type();
         const data = (() => {
             switch (this.form) {
                 case DdbForm.scalar:
@@ -1094,7 +1078,34 @@ export class DdbObj {
             }
             return String(this.value);
         })();
-        return `${type}(${this.name ? `'${this.name}', ` : ''}${data})\n`;
+        return `${colors ? blue(type) : type}(${this.name ? `'${this.name}', ` : ''}${data})\n`;
+    }
+    inspect_type() {
+        const tname = DdbType[this.type];
+        switch (this.form) {
+            case DdbForm.scalar:
+                if (this.type === DdbType.functiondef)
+                    return `functiondef<${DdbFunctionType[this.value.type]}>`;
+                return tname;
+            case DdbForm.vector:
+                if (64 <= this.type && this.type < 128)
+                    return `${DdbType[this.type - 64]}[][${this.rows}]`;
+                return `${tname}[${this.rows}]`;
+            case DdbForm.pair:
+                return `pair<${tname}>`;
+            case DdbForm.set:
+                return `set<${tname}>[${this.rows}]`;
+            case DdbForm.table:
+                return `table[${this.rows}r][${this.cols}c]`;
+            case DdbForm.dict:
+                return `dict<${DdbType[this.value[0].type]}, ${DdbType[this.value[1].type]}>`;
+            case DdbForm.chart:
+                return `chart<${DdbChartType[this.value.type]}>`;
+            case DdbForm.matrix:
+                return `matrix<${tname}>[${this.rows}r][${this.cols}c]`;
+            default:
+                return `${DdbForm[this.form]} ${tname}`;
+        }
     }
     /** 自动转换 js string, boolean 为 DdbObj */
     static to_ddbobj(value) {