dolphindb 0.0.12 → 0.0.13

package/index.js

@@ -152,7 +152,7 @@ class DdbObj {
                     le,
                     form,
                     type,
-                    length: 2 + length,
+                    length: i_data + length,
                     value,
                 });
             }
@@ -160,7 +160,7 @@ class DdbObj {
             case DdbForm.pair:
             case DdbForm.set: {
                 let vector = this.parse_vector(buf_data, le, type);
-                vector.length += 2;
+                vector.length += i_data;
                 vector.form = form;
                 return vector;
             }
@@ -191,17 +191,17 @@ class DdbObj {
                 let i_start = i_items_start + len_items;
                 for (let i = 0; i < cols; i++) {
                     const type = buf_data[i_start];
-                    const i_vector_head = i_start + 2;
-                    let col = this.parse_vector(buf_data.subarray(i_vector_head), le, type);
+                    let col = this.parse_vector(buf_data.subarray(i_start + 2), le, type);
+                    col.length += 2;
                     col.name = colnames[i];
                     value[i] = col;
-                    i_start = i_vector_head + col.length;
+                    i_start += col.length;
                 }
                 return new this({
                     le,
                     form,
                     type,
-                    length: i_start,
+                    length: i_data + i_start,
                     name,
                     rows,
                     cols,
@@ -224,7 +224,7 @@ class DdbObj {
                     le,
                     form,
                     type,
-                    length: 2 + keys.length + values.length,
+                    length: i_data + keys.length + values.length,
                     rows: keys.rows,
                     cols: 2,
                     value: [
@@ -257,7 +257,7 @@ class DdbObj {
                     le,
                     form,
                     type,
-                    length: 11 + len_items,
+                    length: i_data + 11 + len_items,
                     rows,
                     cols,
                     datatype,
@@ -269,7 +269,7 @@ class DdbObj {
                     le,
                     form,
                     type,
-                    length: buf_data.length,
+                    length: i_data + buf_data.length,
                     value: buf_data
                 });
         }
@@ -810,7 +810,7 @@ class DdbObj {
                 throw new Error(`vector ${DdbType[type]} 暂不支持序列化`);
         }
     }
-    [utils_js_1.inspect.custom]() {
+    [utils_js_1.inspect.custom](depth, options, _inspect) {
         const type = (() => {
             const tname = DdbType[this.type];
             switch (this.form) {
@@ -825,7 +825,7 @@ class DdbObj {
                 case DdbForm.pair:
                     return `pair<${tname}>`;
                 case DdbForm.set:
-                    return `set<${tname}>`;
+                    return `set<${tname}>[${this.rows}]`;
                 case DdbForm.table:
                     return `table[${this.rows} rows][${this.cols} cols]`;
                 case DdbForm.dict:
@@ -838,14 +838,37 @@ class DdbObj {
         })();
         const data = (() => {
             if (this.form === DdbForm.pair)
-                return `${(0, utils_js_1.inspect)(this.value[0])}, ${(0, utils_js_1.inspect)(this.value[1])}`;
+                return `${(0, utils_js_1.inspect)(this.value[0], options)}, ${(0, utils_js_1.inspect)(this.value[1], options)}`;
             if (this.form === DdbForm.scalar && this.type === DdbType.functiondef)
-                return (0, utils_js_1.inspect)(this.value.name);
+                return (0, utils_js_1.inspect)(this.value.name, options);
             if (this.value instanceof Uint8Array)
-                return (0, utils_js_1.inspect)((0, utils_js_1.typed_array_to_buffer)(this.value));
-            return (0, utils_js_1.inspect)(this.value);
+                return (0, utils_js_1.inspect)((0, utils_js_1.typed_array_to_buffer)(this.value), options);
+            return (0, utils_js_1.inspect)(this.value, options);
         })();
-        return `${type.blue}(${this.name ? `${(0, utils_js_1.inspect)(this.name)}, ` : ''}${data})`;
+        return `${options.colors ? type.blue : type}(${this.name ? `${(0, utils_js_1.inspect)(this.name, options)}, ` : ''}${data})`;
+    }
+    to_rows() {
+        if (this.form !== DdbForm.table)
+            throw new Error('this.form is not DdbForm.table, cannot call to_rows');
+        let rows = new Array(this.rows);
+        for (let i = 0; i < this.rows; i++) {
+            let row = {};
+            for (let j = 0; j < this.cols; j++) {
+                const { type, name, value } = this.value[j]; // column
+                switch (type) {
+                    case DdbType.bool:
+                        row[name] = Boolean(value[i]);
+                        break;
+                    case DdbType.ipaddr:
+                        row[name] = value.subarray(16 * i, 16 * (i + 1));
+                        break;
+                    default:
+                        row[name] = value[i];
+                }
+            }
+            rows[i] = row;
+        }
+        return rows;
     }
     to_dict() {
         if (this.form !== DdbForm.dict)