dolphindb 2.0.529 → 2.0.532

package/browser.d.ts

@@ -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;
@@ -415,7 +416,9 @@ export class DdbObj {
             case DdbType.symbol:
             case DdbType.code:
             case DdbType.handle:
-            case DdbType.functiondef: {
+            case DdbType.functiondef:
+            // mysql 插件 connect 方法会返回 resource 类型的对象
+            case DdbType.resource: {
                 const i_head = type === DdbType.functiondef ? 1 : 0;
                 let i_zero = buf.indexOf(0, i_head);
                 let i_end; // 整个字符串（包括 0）的末尾，excluding
@@ -793,6 +796,7 @@ export class DdbObj {
                         case DdbType.symbol:
                         case DdbType.code:
                         case DdbType.handle:
+                        case DdbType.resource:
                             return [
                                 DdbObj.enc.encode(value),
                                 Uint8Array.of(0),
@@ -988,34 +992,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:
@@ -1103,7 +1081,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) {
@@ -1291,6 +1296,7 @@ export function format(type, value, le) {
             return value.name.quote('single');
         case DdbType.handle:
         case DdbType.code:
+        case DdbType.resource:
             return value.quote('single');
         case DdbType.datehour:
             return (value === null || value === nulls.int32) ?
@@ -1949,7 +1955,7 @@ export class DDB {
                 this.websocket = websocket;
                 await this.rpc('connect', {});
             },
-            on_message: event => {
+            on_message: (event) => {
                 this.on_message(event);
             }
         });