dolphindb 0.0.12 → 0.0.15

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.ddb_sizes = exports.DdbType = exports.DdbForm = void 0;
+exports.DDB = exports.str2nanotimestamp = exports.nanotimestamp2str = exports.str2timestamp = 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.ddb_sizes = exports.DdbType = exports.DdbForm = void 0;
 const tslib_1 = require("tslib");
 const ws_1 = require("ws");
 const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
@@ -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,42 @@ 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;
+                    case DdbType.symbol_extended: {
+                        const { base, data } = value;
+                        row[name] = base[data[i]];
+                        break;
+                    }
+                    default:
+                        row[name] = value[i];
+                }
+            }
+            rows[i] = row;
+        }
+        return rows;
     }
     to_dict() {
         if (this.form !== DdbForm.dict)
@@ -1067,34 +1095,79 @@ function datetime2str(datetime, format = 'YYYY.MM.DD HH:mm:ss') {
             (0, dayjs_1.default)(exports.timezone_offset + 1000 * datetime).format(format);
 }
 exports.datetime2str = datetime2str;
-function timestamp2str(timestamp) {
+/** format timestamp (bigint) to string
+    - timestamp: bigint value
+    - format?:
+        format string, default to `YYYY.MM.DD HH:mm:ss.SSS`
+        https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
+*/
+function timestamp2str(timestamp, format = 'YYYY.MM.DD HH:mm:ss.SSS') {
     return timestamp === exports.nulls.int64 ?
         ''
         :
-            (0, dayjs_1.default)(exports.timezone_offset + Number(timestamp)).format('YYYY.MM.DD HH:mm:ss.SSS');
+            (0, dayjs_1.default)(exports.timezone_offset + Number(timestamp)).format(format);
 }
 exports.timestamp2str = timestamp2str;
-function nanotimestamp2str(nanotimestamp, format = 'YYYY.MM.DD HH:mm:ss') {
-    return nanotimestamp === exports.nulls.int64 ?
-        ''
-        :
-            (0, dayjs_1.default)(exports.timezone_offset + (Number(nanotimestamp) / 1000000)).format(format) + `.${nanotimestamp % 1000000000n}`;
+/** parse timestamp string to bigint value
+    - str: timestamp string, If it is an empty string, it will return the corresponding empty value (nulls.int64)
+    - format?:
+        The format string corresponding to the incoming string, the default is `YYYY.MM.DD HH:mm:ss.SSS`
+        https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
+*/
+function str2timestamp(str, format = 'YYYY.MM.DD HH:mm:ss.SSS') {
+    if (!str)
+        return exports.nulls.int64;
+    if (str.length !== format.length)
+        throw new Error('The length of the timestamp string is not equal to the length of the format string');
+    return BigInt(-exports.timezone_offset +
+        (0, dayjs_1.default)(str, format).valueOf());
+}
+exports.str2timestamp = str2timestamp;
+/** format nanotimestamp value (bigint) to string
+    - nanotimestamp: bigint value
+    - format?:
+        format string, default is `YYYY.MM.DD HH:mm:ss.SSSSSSSSS`
+        Seconds are in the format ss (must be included); nanoseconds are in the format SSSSSSSSS (must be included)
+        https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
+*/
+function nanotimestamp2str(nanotimestamp, format = 'YYYY.MM.DD HH:mm:ss.SSSSSSSSS') {
+    if (nanotimestamp === exports.nulls.int64)
+        return '';
+    const i_second_start = format.indexOf('ss');
+    if (i_second_start === -1)
+        throw new Error('The format string must contain the format for seconds (ss)');
+    const i_second_end = i_second_start + 2;
+    const i_nanosecond_start = format.indexOf('SSSSSSSSS', i_second_end);
+    if (i_nanosecond_start === -1)
+        throw new Error('The format string must contain the format for nanoseconds (SSSSSSSSS)');
+    return ((0, dayjs_1.default)(exports.timezone_offset + (Number(nanotimestamp) / 1000000)).format(format.slice(0, i_second_end)) +
+        format.slice(i_second_end, i_nanosecond_start) +
+        String(nanotimestamp % 1000000000n));
 }
 exports.nanotimestamp2str = nanotimestamp2str;
 /** parse nano timestamp string to bigint value
-    - str: nano timestamp string, 如果为空字符串会返回对应的空值 (nulls.int64)
-    - format?: 对应传入字符串的到秒之前 (包括) 的格式串，默认是 `YYYY.MM.DD HH:mm:ss`
+    - str: nano timestamp string, If it is an empty string, it will return the corresponding empty value (nulls.int64)
+    - format?:
+        The format string corresponding to the incoming string, the default is `YYYY.MM.DD HH:mm:ss.SSSSSSSSS`
+        Seconds are in the format ss (must be included); nanoseconds are in the format SSSSSSSSS (must be included)
         https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
 */
-function str2nanotimestamp(str, format = 'YYYY.MM.DD HH:mm:ss') {
+function str2nanotimestamp(str, format = 'YYYY.MM.DD HH:mm:ss.SSSSSSSSS') {
     if (!str)
         return exports.nulls.int64;
-    if (str.length - format.length !== 9)
-        throw new Error('nanotimestamp 字符串长度减格式串长度应该等于 9');
+    if (str.length !== format.length)
+        throw new Error('nanotimestamp string length is not equal to format string length');
+    const i_second_start = format.indexOf('ss');
+    if (i_second_start === -1)
+        throw new Error('The format string must contain the format for seconds (ss)');
+    const i_second_end = i_second_start + 2;
+    const i_nanosecond_start = format.indexOf('SSSSSSSSS', i_second_end);
+    if (i_nanosecond_start === -1)
+        throw new Error('Format string must contain nanosecond format (SSSSSSSSS)');
     return (BigInt(-exports.timezone_offset +
-        (0, dayjs_1.default)(str.slice(0, format.length), format).valueOf()) * 1000000n
+        (0, dayjs_1.default)(str.slice(0, i_second_end), format.slice(0, i_second_end)).valueOf()) * 1000000n
         +
-            BigInt(str.slice(format.length)));
+            BigInt(str.slice(i_nanosecond_start, i_nanosecond_start + 9)));
 }
 exports.str2nanotimestamp = str2nanotimestamp;
 class DDB {
@@ -1189,7 +1262,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;