dolphindb 2.0.518 → 2.0.521

package/browser.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ddb = exports.DDB = exports.int1282str = exports.uuid2str = exports.ipaddr2str = exports.str2nanotimestamp = exports.nanotimestamp2str = exports.nanotime2str = exports.str2timestamp = exports.datehour2str = exports.timestamp2str = exports.datetime2str = exports.second2str = exports.minute2str = exports.time2str = exports.month2str = exports.date2str = exports.DdbTable = exports.DdbSetString = exports.DdbSetDouble = exports.DdbSetInt = exports.DdbVectorSymbol = exports.DdbVectorAny = exports.DdbVectorString = exports.DdbVectorDouble = exports.DdbVectorInt = exports.DdbFunction = exports.DdbPair = exports.DdbNanoTimeStamp = exports.DdbTimeStamp = exports.DdbDateTime = exports.DdbDouble = exports.DdbLong = exports.DdbString = exports.DdbInt = exports.DdbChar = exports.DdbBool = exports.DdbVoid = exports.format = exports.DdbObj = exports.timezone_offset = exports.nulls = exports.DdbDurationUnit = exports.DdbFunctionType = exports.DdbType = exports.DdbForm = void 0;
+exports.nanotime2str = exports.nanotime2ns = exports.str2timestamp = exports.datehour2str = exports.datehour2ms = exports.timestamp2str = exports.timestamp2ms = exports.datetime2str = exports.datetime2ms = exports.second2str = exports.second2ms = exports.minute2str = exports.minute2ms = exports.time2str = exports.time2ms = exports.month2str = exports.month2ms = exports.date2str = exports.date2ms = exports.DdbTable = exports.DdbDict = exports.DdbSetString = exports.DdbSetDouble = exports.DdbSetInt = exports.DdbVectorSymbol = exports.DdbVectorAny = exports.DdbVectorString = exports.DdbVectorDouble = exports.DdbVectorInt = exports.DdbFunction = exports.DdbPair = exports.DdbNanoTimeStamp = exports.DdbTimeStamp = exports.DdbDateTime = exports.DdbDouble = exports.DdbLong = exports.DdbString = exports.DdbInt = exports.DdbChar = exports.DdbBool = exports.DdbVoid = exports.format = exports.DdbObj = exports.timezone_offset = exports.nulls = exports.DdbChartType = exports.DdbDurationUnit = exports.DdbFunctionType = exports.DdbType = exports.DdbForm = void 0;
+exports.ddb = exports.DDB = exports.int1282str = exports.uuid2str = exports.ipaddr2str = exports.str2nanotimestamp = exports.nanotimestamp2str = exports.nanotimestamp2ns = void 0;
 const tslib_1 = require("tslib");
 const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
 const customParseFormat_js_1 = tslib_1.__importDefault(require("dayjs/plugin/customParseFormat.js"));
@@ -20,13 +21,14 @@ var DdbForm;
     DdbForm[DdbForm["dict"] = 5] = "dict";
     DdbForm[DdbForm["table"] = 6] = "table";
     DdbForm[DdbForm["chart"] = 7] = "chart";
+    /** Node internal communication may be used, calling function execution script generally does not return this type */
     DdbForm[DdbForm["chunk"] = 8] = "chunk";
     /** sysobj */
     DdbForm[DdbForm["object"] = 9] = "object";
 })(DdbForm = exports.DdbForm || (exports.DdbForm = {}));
 /** DolphinDB DataType
-    对应的 array vector 类型为 64 + 基本类型
-    对应的 extended 类型为 128 + 基本类型
+     The corresponding array vector type is 64 + base type
+     The corresponding extended type is 128 + base type
 */
 var DdbType;
 (function (DdbType) {
@@ -94,6 +96,19 @@ var DdbDurationUnit;
     DdbDurationUnit[DdbDurationUnit["y"] = 9] = "y";
     DdbDurationUnit[DdbDurationUnit["B"] = 10] = "B";
 })(DdbDurationUnit = exports.DdbDurationUnit || (exports.DdbDurationUnit = {}));
+var DdbChartType;
+(function (DdbChartType) {
+    DdbChartType[DdbChartType["area"] = 0] = "area";
+    DdbChartType[DdbChartType["bar"] = 1] = "bar";
+    DdbChartType[DdbChartType["column"] = 2] = "column";
+    DdbChartType[DdbChartType["histogram"] = 3] = "histogram";
+    DdbChartType[DdbChartType["line"] = 4] = "line";
+    DdbChartType[DdbChartType["pie"] = 5] = "pie";
+    DdbChartType[DdbChartType["scatter"] = 6] = "scatter";
+    DdbChartType[DdbChartType["trend"] = 7] = "trend";
+    DdbChartType[DdbChartType["kline"] = 8] = "kline";
+    DdbChartType[DdbChartType["stack"] = 9] = "stack";
+})(DdbChartType = exports.DdbChartType || (exports.DdbChartType = {}));
 exports.nulls = {
     int8: -0x80,
     int16: -32768,
@@ -198,7 +213,8 @@ class DdbObj {
                     value,
                 });
             }
-            case DdbForm.dict: {
+            case DdbForm.dict:
+            case DdbForm.chart: {
                 // <Buffer 19 05 type = any, form = dict
                 // 12 01 keys.type = string, keys.form = vector
                 // 03 00 00 00 01 00 00 00 keys.cols = 3, keys.rows = 1
@@ -210,9 +226,9 @@ class DdbObj {
                 keys.length += 2;
                 let values = this.parse_vector(buf_data.subarray(keys.length + 2), le, buf_data[keys.length]);
                 values.length += 2;
-                return new this({
+                let dict = new this({
                     le,
-                    form,
+                    form: DdbForm.dict,
                     type,
                     length: i_data + keys.length + values.length,
                     rows: keys.rows,
@@ -222,6 +238,30 @@ class DdbObj {
                         values
                     ],
                 });
+                if (form === DdbForm.dict)
+                    return dict;
+                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,
+                        stacking: stacking.value,
+                        titles: {
+                            chart,
+                            x_axis,
+                            y_axis,
+                        },
+                        extras: {
+                            multi_y_axis,
+                            ...extras_others,
+                        },
+                        data,
+                        ...others,
+                    };
+                    return dict;
+                }
             }
             case DdbForm.matrix: {
                 // rename!(
@@ -791,6 +831,23 @@ class DdbObj {
                         value[0].pack(),
                         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 { 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
+                        }),
+                        data,
+                    });
+                    return [
+                        keys.pack(),
+                        values.pack(),
+                    ];
+                }
                 case DdbForm.matrix: {
                     const { rows, cols, data } = value;
                     return [
@@ -803,7 +860,7 @@ class DdbObj {
                     ];
                 }
                 default:
-                    throw new Error(`${DdbForm[form]} 暂不支持序列化`);
+                    throw new Error(`${DdbForm[form]} Serialization is not currently supported`);
             }
         })();
         if (!body)
@@ -916,6 +973,8 @@ class DdbObj {
                     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:
@@ -1009,6 +1068,24 @@ class DdbObj {
         })();
         return `${type}(${this.name ? `'${this.name}', ` : ''}${data})\n`;
     }
+    /** 自动转换 js string, boolean 为 DdbObj */
+    static to_ddbobj(value) {
+        if (value && value instanceof DdbObj)
+            return value;
+        const type = typeof value;
+        switch (type) {
+            case 'string':
+                return new DdbString(value);
+            case 'boolean':
+                return new DdbBool(value);
+            default:
+                throw new Error(`Cannot automatically convert ${type} to DdbObj`);
+        }
+    }
+    /** 转换 js 数组为 DdbObj[] */
+    static to_ddbobjs(values) {
+        return values.map(value => this.to_ddbobj(value));
+    }
     to_cols() {
         return this.value.map(col => {
             let col_ = {
@@ -1062,13 +1139,22 @@ class DdbObj {
         }
         return rows;
     }
-    to_dict() {
+    to_dict({ strip, deep, } = {}) {
         if (this.form !== DdbForm.dict)
-            throw new Error('this.form is not DdbForm.dict, cannot convert to Object');
-        const [{ value: keys }, { value: values }] = this.value;
+            throw new Error('this.form is not DdbForm.dict and cannot be converted to js object');
+        const [{ value: keys, type: key_type }, { value: values, type: value_type }] = this.value;
+        if (key_type !== DdbType.string || value_type !== DdbType.any)
+            throw new Error('Not dict<string, any>, automatic conversion to js object is not supported for the time being');
+        if (deep && !strip)
+            throw new Error('strip = true must be set when deep = true');
         let obj = {};
-        for (let i = 0; i < this.rows; i++)
-            obj[keys[i]] = values[i].value;
+        for (let i = 0; i < this.rows; i++) {
+            let value = values[i];
+            if (deep && value.form === DdbForm.dict)
+                obj[keys[i]] = value.to_dict({ strip, deep });
+            else
+                obj[keys[i]] = strip ? value.value : value;
+        }
         return obj;
     }
 }
@@ -1174,7 +1260,7 @@ function format(type, value, le) {
         case DdbType.uuid:
             return uuid2str(value, le);
         case DdbType.functiondef:
-            return value.quote('single');
+            return value.name.quote('single');
         case DdbType.handle:
         case DdbType.code:
             return value.quote('single');
@@ -1222,7 +1308,6 @@ class DdbVoid extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.void,
-            length: 0,
             value: null,
         });
     }
@@ -1233,7 +1318,6 @@ class DdbBool extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.bool,
-            length: 1,
             value,
         });
     }
@@ -1244,7 +1328,6 @@ class DdbChar extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.char,
-            length: 1,
             value: typeof value === 'string' ?
                 value.charCodeAt(0)
                 :
@@ -1258,7 +1341,6 @@ class DdbInt extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.int,
-            length: 4,
             value,
         });
     }
@@ -1269,7 +1351,6 @@ class DdbString extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.string,
-            length: 0,
             value
         });
     }
@@ -1280,7 +1361,6 @@ class DdbLong extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.long,
-            length: 8,
             value
         });
     }
@@ -1291,7 +1371,6 @@ class DdbDouble extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.double,
-            length: 8,
             value
         });
     }
@@ -1302,7 +1381,6 @@ class DdbDateTime extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.datetime,
-            length: 4,
             value
         });
     }
@@ -1313,7 +1391,6 @@ class DdbTimeStamp extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.timestamp,
-            length: 8,
             value
         });
     }
@@ -1324,7 +1401,6 @@ class DdbNanoTimeStamp extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.nanotimestamp,
-            length: 8,
             value
         });
     }
@@ -1335,7 +1411,6 @@ class DdbPair extends DdbObj {
         super({
             form: DdbForm.pair,
             type: DdbType.int,
-            length: 0,
             rows: 2,
             cols: 1,
             value: Int32Array.of(l === null ? exports.nulls.int32 : l, r === null ? exports.nulls.int32 : r)
@@ -1348,7 +1423,6 @@ class DdbFunction extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.functiondef,
-            length: 0,
             value: { type, name }
         });
     }
@@ -1359,7 +1433,6 @@ class DdbVectorInt extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.int,
-            length: 0,
             rows: ints.length,
             cols: 1,
             value: ints instanceof Int32Array ?
@@ -1379,7 +1452,6 @@ class DdbVectorDouble extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.double,
-            length: 0,
             rows: doubles.length,
             cols: 1,
             value: doubles instanceof Float64Array ?
@@ -1399,7 +1471,6 @@ class DdbVectorString extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.string,
-            length: 0,
             rows: strings.length,
             cols: 1,
             value: strings,
@@ -1413,10 +1484,9 @@ class DdbVectorAny extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.any,
-            length: 0,
             rows: objs.length,
             cols: 1,
-            value: objs,
+            value: DdbObj.to_ddbobjs(objs),
             name,
         });
     }
@@ -1440,7 +1510,6 @@ class DdbVectorSymbol extends DdbObj {
         super({
             form: DdbForm.vector,
             type: DdbType.symbol_extended,
-            length: 0,
             rows: strings.length,
             cols: 1,
             value: {
@@ -1458,7 +1527,6 @@ class DdbSetInt extends DdbObj {
         super({
             form: DdbForm.set,
             type: DdbType.int,
-            length: 0,
             rows: ints instanceof Set ?
                 ints.size
                 :
@@ -1480,7 +1548,6 @@ class DdbSetDouble extends DdbObj {
         super({
             form: DdbForm.set,
             type: DdbType.double,
-            length: 0,
             rows: doubles instanceof Set ?
                 doubles.size
                 :
@@ -1504,7 +1571,6 @@ class DdbSetString extends DdbObj {
         super({
             form: DdbForm.set,
             type: DdbType.string,
-            length: 0,
             rows: strings.length,
             cols: 1,
             value: strings
@@ -1512,12 +1578,41 @@ class DdbSetString extends DdbObj {
     }
 }
 exports.DdbSetString = DdbSetString;
+/** Constructs a DdbDict object, which supports two usages:
+     - The incoming type is the keys of DdbObj<DdbVectorValue>, and the two parameters of values directly form the DdbDict of dict<keys.type, values.type>
+     - Pass in js object (type is Record<string, boolean | string | DdbObj>), automatically converted to DdbDict of dict<string, any>
+*/
+class DdbDict extends DdbObj {
+    constructor(arg0, arg1) {
+        if (arg1)
+            super({
+                form: DdbForm.dict,
+                type: arg1.type,
+                rows: arg0.rows,
+                cols: 2,
+                value: [arg0, arg1]
+            });
+        else {
+            const keys = Object.keys(arg0);
+            super({
+                form: DdbForm.dict,
+                type: DdbType.any,
+                rows: keys.length,
+                cols: 2,
+                value: [
+                    new DdbVectorString(keys),
+                    new DdbVectorAny(Object.values(arg0))
+                ]
+            });
+        }
+    }
+}
+exports.DdbDict = DdbDict;
 class DdbTable extends DdbObj {
     constructor(columns, name = '') {
         super({
             form: DdbForm.table,
             type: DdbType.void,
-            length: 0,
             rows: columns[0].rows,
             cols: columns.length,
             name,
@@ -1526,13 +1621,27 @@ class DdbTable extends DdbObj {
     }
 }
 exports.DdbTable = DdbTable;
+function date2ms(date) {
+    return (date === null || date === exports.nulls.int32) ?
+        null
+        :
+            exports.timezone_offset + 1000 * 3600 * 24 * date;
+}
+exports.date2ms = date2ms;
 function date2str(date, format = 'YYYY.MM.DD') {
     return (date === null || date === exports.nulls.int32) ?
-        'null'
+        null
         :
-            (0, dayjs_1.default)(exports.timezone_offset + 1000 * 3600 * 24 * date).format(format);
+            (0, dayjs_1.default)(date2ms(date)).format(format);
 }
 exports.date2str = date2str;
+function month2ms(month) {
+    return (month === null || month === exports.nulls.int32) ?
+        null
+        :
+            (0, dayjs_1.default)(month2str(month), 'YYYY.MM[M]').valueOf();
+}
+exports.month2ms = month2ms;
 function month2str(month) {
     if (month === null || month === exports.nulls.int32)
         return 'null';
@@ -1543,37 +1652,69 @@ function month2str(month) {
     return `${String(year).padStart(4, '0')}.${String(_month + 1).padStart(2, '0')}M`;
 }
 exports.month2str = month2str;
+function time2ms(time) {
+    return (time === null || time === exports.nulls.int32) ?
+        null
+        :
+            exports.timezone_offset + time;
+}
+exports.time2ms = time2ms;
 function time2str(time, format = 'HH:mm:ss.SSS') {
     return (time === null || time === exports.nulls.int32) ?
-        'null'
+        null
         :
-            (0, dayjs_1.default)(exports.timezone_offset + time)
-                .format(format);
+            (0, dayjs_1.default)(time2ms(time)).format(format);
 }
 exports.time2str = time2str;
+function minute2ms(minute) {
+    return (minute === null || minute === exports.nulls.int32) ?
+        null
+        :
+            exports.timezone_offset + 60 * 1000 * minute;
+}
+exports.minute2ms = minute2ms;
 function minute2str(minute, format = 'HH:mm[m]') {
     return (minute === null || minute === exports.nulls.int32) ?
         'null'
         :
-            (0, dayjs_1.default)(exports.timezone_offset + 60 * 1000 * minute)
-                .format(format);
+            (0, dayjs_1.default)(minute2ms(minute)).format(format);
 }
 exports.minute2str = minute2str;
+function second2ms(second) {
+    return (second === null || second === exports.nulls.int32) ?
+        null
+        :
+            exports.timezone_offset + 1000 * second;
+}
+exports.second2ms = second2ms;
 function second2str(second, format = 'HH:mm:ss') {
     return (second === null || second === exports.nulls.int32) ?
         'null'
         :
-            (0, dayjs_1.default)(exports.timezone_offset + 1000 * second)
-                .format(format);
+            (0, dayjs_1.default)(second2ms(second)).format(format);
 }
 exports.second2str = second2str;
+function datetime2ms(datetime) {
+    return (datetime === null || datetime === exports.nulls.int32) ?
+        null
+        :
+            exports.timezone_offset + 1000 * datetime;
+}
+exports.datetime2ms = datetime2ms;
 function datetime2str(datetime, format = 'YYYY.MM.DD HH:mm:ss') {
     return (datetime === null || datetime === exports.nulls.int32) ?
         'null'
         :
-            (0, dayjs_1.default)(exports.timezone_offset + 1000 * datetime).format(format);
+            (0, dayjs_1.default)(datetime2ms(datetime)).format(format);
 }
 exports.datetime2str = datetime2str;
+function timestamp2ms(timestamp) {
+    return (timestamp === null || timestamp === exports.nulls.int64) ?
+        null
+        :
+            exports.timezone_offset + Number(timestamp);
+}
+exports.timestamp2ms = timestamp2ms;
 /** format timestamp (bigint) to string
     - timestamp: bigint value
     - format?:
@@ -1584,9 +1725,16 @@ function timestamp2str(timestamp, format = 'YYYY.MM.DD HH:mm:ss.SSS') {
     return (timestamp === null || timestamp === exports.nulls.int64) ?
         'null'
         :
-            (0, dayjs_1.default)(exports.timezone_offset + Number(timestamp)).format(format);
+            (0, dayjs_1.default)(timestamp2ms(timestamp)).format(format);
 }
 exports.timestamp2str = timestamp2str;
+function datehour2ms(datehour) {
+    return (datehour === null || datehour === exports.nulls.int32) ?
+        null
+        :
+            exports.timezone_offset + 1000 * 3600 * datehour;
+}
+exports.datehour2ms = datehour2ms;
 function datehour2str(datehour, format = 'YYYY.MM.DDTHH') {
     return (datehour === null || datehour === exports.nulls.int32) ?
         'null'
@@ -1609,6 +1757,10 @@ function str2timestamp(str, format = 'YYYY.MM.DD HH:mm:ss.SSS') {
         (0, dayjs_1.default)(str, format).valueOf());
 }
 exports.str2timestamp = str2timestamp;
+function nanotime2ns(nanotime) {
+    return nanotimestamp2ns(nanotime);
+}
+exports.nanotime2ns = nanotime2ns;
 function nanotime2str(nanotime, format = 'HH:mm:ss.SSSSSSSSS') {
     if (nanotime === null || nanotime === exports.nulls.int64)
         return 'null';
@@ -1626,6 +1778,13 @@ function nanotime2str(nanotime, format = 'HH:mm:ss.SSSSSSSSS') {
         String(nanotime % 1000000000n).padStart(9, '0'));
 }
 exports.nanotime2str = nanotime2str;
+function nanotimestamp2ns(nanotimestamp) {
+    return (nanotimestamp === null || nanotimestamp === exports.nulls.int64) ?
+        null
+        :
+            BigInt(exports.timezone_offset) * 1000000n + nanotimestamp;
+}
+exports.nanotimestamp2ns = nanotimestamp2ns;
 /** format nanotimestamp value (bigint) to string
     - nanotimestamp: bigint value
     - format?:
@@ -1945,7 +2104,7 @@ class DDB {
                 reject(error);
             }
         };
-        args = this.to_ddbobjs(args);
+        args = DdbObj.to_ddbobjs(args);
         const command = this.enc.encode((() => {
             switch (type) {
                 case 'function':
@@ -2013,7 +2172,7 @@ class DDB {
             args = [
                 new DdbVectorString(nodes),
                 func,
-                new DdbVectorAny(this.to_ddbobjs(args)),
+                new DdbVectorAny(args),
                 ...(() => {
                     if (typeof add_node_alias !== 'undefined')
                         return [add_node_alias];
@@ -2094,24 +2253,6 @@ class DDB {
                     })
         };
     }
-    /** 自动转换 js string, boolean 为 DdbObj */
-    to_ddbobj(value) {
-        if (value instanceof DdbObj)
-            return value;
-        const type = typeof value;
-        switch (type) {
-            case 'string':
-                return new DdbString(value);
-            case 'boolean':
-                return new DdbBool(value);
-            default:
-                throw new Error(`不能自动转换 ${type} 至 DdbObj`);
-        }
-    }
-    /** 转换 js 数组为 DdbObj[] */
-    to_ddbobjs(values) {
-        return values.map(value => this.to_ddbobj(value));
-    }
 }
 exports.DDB = DDB;
 /** little endian (client) */