dolphindb 0.0.11 → 0.0.14

package/README.zh.md

@@ -46,6 +46,7 @@ npm install dolphindb
 ```ts
 import { DDB } from 'dolphindb'
 // 已有的使用 CommonJS 模块的项目的导入方法为 const { DDB } = require('dolphindb')
+// 在浏览器中使用: import { DDB } form 'dolphindb/browser.js'
 
 // 创建数据库对象，初始化 WebSocket 连接地址
 let ddb = new DDB('ws://127.0.0.1:8848')

package/browser.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ddb = exports.DDB = exports.str2nanotimestamp = exports.nanotimestamp2str = exports.timestamp2str = exports.datetime2str = exports.date2str = exports.DdbFunction = exports.DdbPair = exports.DdbVectorAny = exports.DdbVectorDouble = exports.DdbVectorString = exports.DdbVectorInt = exports.DdbNanoTimeStamp = exports.DdbTimeStamp = exports.DdbDateTime = exports.DdbDouble = exports.DdbLong = exports.DdbString = exports.DdbInt = exports.DdbChar = exports.DdbBool = exports.DdbVoid = exports.DdbObj = exports.timezone_offset = exports.nulls = exports.DdbFunctionType = exports.DdbType = exports.DdbForm = void 0;
 const tslib_1 = require("tslib");
 const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
-const customParseFormat_1 = tslib_1.__importDefault(require("dayjs/plugin/customParseFormat"));
-dayjs_1.default.extend(customParseFormat_1.default);
+const customParseFormat_js_1 = tslib_1.__importDefault(require("dayjs/plugin/customParseFormat.js"));
+dayjs_1.default.extend(customParseFormat_js_1.default);
 require("xshell/prototype.browser");
 const utils_browser_1 = require("xshell/utils.browser");
 var DdbForm;
@@ -115,7 +115,7 @@ class DdbObj {
                     le,
                     form,
                     type,
-                    length: 2 + length,
+                    length: i_data + length,
                     value,
                 });
             }
@@ -123,7 +123,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;
             }
@@ -154,17 +154,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,
@@ -187,7 +187,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: [
@@ -220,7 +220,7 @@ class DdbObj {
                     le,
                     form,
                     type,
-                    length: 11 + len_items,
+                    length: i_data + 11 + len_items,
                     rows,
                     cols,
                     datatype,
@@ -232,7 +232,7 @@ class DdbObj {
                     le,
                     form,
                     type,
-                    length: buf_data.length,
+                    length: i_data + buf_data.length,
                     value: buf_data
                 });
         }
@@ -788,7 +788,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:
@@ -829,16 +829,28 @@ class DdbObj {
         });
     }
     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 c = this.value[j];
-                if (c.type === DdbType.ipaddr) {
-                    row[c.name] = c.value.subarray(16 * i, 16 * (i + 1));
-                    continue;
+                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;
+                    case DdbType.symbol_extended: {
+                        const { base, data } = value;
+                        row[name] = base[data[i]];
+                        break;
+                    }
+                    default:
+                        row[name] = value[i];
                 }
-                row[c.name] = c.value[i];
             }
             rows[i] = row;
         }
@@ -1189,7 +1201,10 @@ class DDB {
                 '    )\n' +
                 '}\n', { urgent: true });
         if (login)
-            await this.call('login', [username, password], { urgent: true });
+            if (this.python)
+                await this.eval(`login(${username.quote('double')}, ${password.quote('double')})`, { urgent: true });
+            else
+                await this.call('login', [username, password], { urgent: true });
     }
     get_rpc_options({ urgent = false, secondary = false, async: _async = false, pickle = false, clear = false, api = false, compress = false, cancellable = true, priority = urgent ? 8 : 4, parallelism = 8, root_id = '', limit, } = {}) {
         let flag = 0;