dolphindb 2.0.511 → 2.0.514

package/browser.d.ts

@@ -10,6 +10,10 @@ export declare enum DdbForm {
     chart = 7,
     chunk = 8
 }
+/** DolphinDB DataType
+    对应的 array vector 类型为 64 + 基本类型
+    对应的 extended 类型为 128 + 基本类型
+*/
 export declare enum DdbType {
     void = 0,
     bool = 1,
@@ -91,7 +95,7 @@ export interface DdbArrayVectorBlock {
     unit: 1 | 2 | 4;
     rows: number;
     lengths: Uint8Array | Uint16Array | Uint32Array;
-    data: DdbVectorValue;
+    data: Int8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array;
 }
 export interface DdbMatrixValue {
     rows: DdbObj<DdbVectorValue>;
@@ -182,6 +186,7 @@ export declare class DdbObj<T extends DdbValue = DdbValue> {
     to_rows<T extends Record<string, any> = Record<string, any>>(): T[];
     to_dict<T = Record<string, any>>(): T;
 }
+export declare function format(type: DdbType, value: DdbValue, le: boolean): string;
 export declare class DdbVoid extends DdbObj<undefined> {
     constructor();
 }
@@ -246,6 +251,10 @@ export declare class DdbTable extends DdbObj<DdbObj[]> {
     constructor(columns: DdbObj[], name?: string);
 }
 export declare function date2str(date: number, format?: string): string;
+export declare function month2str(month: number | null): string;
+export declare function time2str(time: number, format?: string): string;
+export declare function minute2str(minute: number | null, format?: string): string;
+export declare function second2str(second: number | null, format?: string): string;
 export declare function datetime2str(datetime: number, format?: string): string;
 /** format timestamp (bigint) to string
     - timestamp: bigint value
@@ -254,6 +263,7 @@ export declare function datetime2str(datetime: number, format?: string): string;
         https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
 */
 export declare function timestamp2str(timestamp: bigint, format?: string): string;
+export declare function datehour2str(datehour: number, format?: string): string;
 /** 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?:
@@ -261,6 +271,7 @@ export declare function timestamp2str(timestamp: bigint, format?: string): strin
         https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
 */
 export declare function str2timestamp(str: string, format?: string): bigint;
+export declare function nanotime2str(nanotime: bigint, format?: string): string;
 /** format nanotimestamp value (bigint) to string
     - nanotimestamp: bigint value
     - format?:
@@ -277,6 +288,9 @@ export declare function nanotimestamp2str(nanotimestamp: bigint, format?: string
         https://day.js.org/docs/en/parse/string-format#list-of-all-available-parsing-tokens
 */
 export declare function str2nanotimestamp(str: string, format?: string): bigint;
+export declare function ipaddr2str(buffer: Uint8Array, le?: boolean): string;
+export declare function uuid2str(buffer: Uint8Array, le?: boolean): string;
+export declare function int1282str(buffer: Uint8Array, le?: boolean): string;
 export declare class DDB {
     /** 当前的 session id (http 或 tcp) */
     sid: string;
@@ -463,4 +477,3 @@ export interface DdbErrorMessage {
 }
 export declare type DdbMessage = DdbPrintMessage | DdbObjectMessage | DdbErrorMessage;
 export declare let ddb: DDB;
-export default ddb;

package/browser.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ddb = exports.DDB = exports.str2nanotimestamp = exports.nanotimestamp2str = exports.str2timestamp = exports.timestamp2str = exports.datetime2str = 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.DdbObj = exports.timezone_offset = exports.nulls = 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.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;
 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,6 +20,10 @@ var DdbForm;
     DdbForm[DdbForm["chart"] = 7] = "chart";
     DdbForm[DdbForm["chunk"] = 8] = "chunk";
 })(DdbForm = exports.DdbForm || (exports.DdbForm = {}));
+/** DolphinDB DataType
+    对应的 array vector 类型为 64 + 基本类型
+    对应的 extended 类型为 128 + 基本类型
+*/
 var DdbType;
 (function (DdbType) {
     DdbType[DdbType["void"] = 0] = "void";
@@ -336,6 +340,7 @@ class DdbObj {
             case DdbType.string:
             case DdbType.symbol:
             case DdbType.code:
+            case DdbType.handle:
             case DdbType.functiondef: {
                 const i_head = type === DdbType.functiondef ? 1 : 0;
                 let i_zero = buf.indexOf(0, i_head);
@@ -394,7 +399,7 @@ class DdbObj {
                 ];
             }
             default:
-                return [0, buf];
+                throw new Error(`${DdbType[type] || type} 暂时不支持解析`);
         }
     }
     /** parse: rows, cols, items
@@ -470,7 +475,7 @@ class DdbObj {
                 unit,
                 rows,
                 lengths,
-                data
+                data: data
             });
             i_block_start = i_data_start + len_items;
             i_row += rows;
@@ -533,6 +538,7 @@ class DdbObj {
                 ];
             case DdbType.string:
             case DdbType.symbol:
+            case DdbType.handle:
             case DdbType.code: {
                 let value = new Array(length);
                 let i_head = 0, i_tail = i_head;
@@ -712,6 +718,7 @@ class DdbObj {
                         case DdbType.string:
                         case DdbType.symbol:
                         case DdbType.code:
+                        case DdbType.handle:
                             return [
                                 DdbObj.enc.encode(value),
                                 Uint8Array.of(0),
@@ -738,10 +745,8 @@ class DdbObj {
                             const { unit, data } = this.value;
                             return [Int32Array.of(data, unit)];
                         }
-                        case DdbType.handle:
-                            throw new Error('DolphinDB Server 不支持 handle 的反序列化');
                         default:
-                            throw new Error(`${DdbType[type]} 暂时不支持序列化`);
+                            throw new Error(`${DdbType[type] || type} 暂时不支持序列化`);
                     }
                 case DdbForm.vector:
                 case DdbForm.pair:
@@ -834,6 +839,7 @@ class DdbObj {
                 return [value];
             case DdbType.string:
             case DdbType.symbol:
+            case DdbType.handle:
             case DdbType.code: {
                 let bufs = new Array(length * 2);
                 for (let i = 0; i < length; i++) {
@@ -903,33 +909,99 @@ class DdbObj {
                 case DdbForm.set:
                     return `set<${tname}>[${this.rows}]`;
                 case DdbForm.table:
-                    return `table[${this.rows} rows][${this.cols} cols]`;
+                    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.matrix:
-                    return `matrix<${DdbType[this.type]}>[${this.rows} rows][${this.cols} cols]`;
+                    return `matrix<${DdbType[this.type]}>[${this.rows}r][${this.cols}c]`;
                 default:
                     return `${DdbForm[this.form]} ${tname}`;
             }
         })();
         const data = (() => {
             switch (this.form) {
-                case DdbForm.pair:
-                    return `${this.value[0]}, ${this.value[1]}`;
                 case DdbForm.scalar:
+                    return format(this.type, this.value, this.le);
+                case DdbForm.vector:
+                case DdbForm.pair:
+                case DdbForm.set: {
+                    const form = this.form;
+                    function format_array(items, ellipsis) {
+                        const str_items = items.join(', ') + (ellipsis ? ', ...' : '');
+                        return form === DdbForm.pair ?
+                            str_items
+                            :
+                                str_items.bracket('square');
+                    }
+                    if (64 <= this.type && this.type < 128) { // array vector
+                        // 因为 array vector 目前只支持：Logical, Integral（不包括 INT128, COMPRESS 类型）, Floating, Temporal
+                        // 都对应 TypedArray 中的一格，所以直接根据 index 去取即可
+                        // av = array(INT[], 0, 5)
+                        // append!(av, [1..1])
+                        // append!(av, [1..70000])
+                        // append!(av, [1..1])
+                        // append!(av, [1..500])
+                        // ...
+                        // av
+                        const _type = this.type - 64;
+                        const limit = 10;
+                        let items = new Array(Math.min(limit, this.rows));
+                        let i_items = 0;
+                        for (const { lengths, data } of this.value) {
+                            let acc_len = 0;
+                            for (const length of lengths) {
+                                let _items = new Array(Math.min(limit, length));
+                                for (let i = 0; i < _items.length; i++)
+                                    _items[i] = format(_type, data[acc_len + i], this.le);
+                                items[i_items++] = format_array(_items, length > limit);
+                                acc_len += length;
+                            }
+                            if (i_items >= limit)
+                                break;
+                        }
+                        return format_array(items, this.rows > limit);
+                    }
                     switch (this.type) {
-                        case DdbType.functiondef:
-                            return `'${this.value.name}'`;
-                        case DdbType.duration: {
-                            const { data, unit } = this.value;
-                            return `${data}${DdbDurationUnit[unit]}`;
+                        case DdbType.symbol_extended: {
+                            const limit = 50;
+                            const { base, data } = this.value;
+                            let items = new Array(Math.min(limit, data.length));
+                            for (let i = 0; i < items.length; i++)
+                                items[i] = base[data[i]].quote('single');
+                            return format_array(items, data.length > limit);
+                        }
+                        case DdbType.uuid:
+                        case DdbType.int128:
+                        case DdbType.ipaddr: {
+                            const limit = 10;
+                            const value = this.value;
+                            const len_data = value.length / 16;
+                            let items = new Array(Math.min(limit, len_data));
+                            for (let i = 0; i < items.length; i++)
+                                items[i] = format(this.type, value.subarray(16 * i, 16 * (i + 1)), this.le);
+                            return format_array(items, len_data > limit);
+                        }
+                        case DdbType.complex:
+                        case DdbType.point: {
+                            const limit = 20;
+                            const value = this.value;
+                            const len_data = value.length / 2;
+                            let items = new Array(Math.min(limit, len_data));
+                            for (let i = 0; i < items.length; i++)
+                                items[i] = format(this.type, value.subarray(2 * i, 2 * (i + 1)), this.le);
+                            return format_array(items, len_data > limit);
+                        }
+                        default: {
+                            const limit = 50;
+                            let items = new Array(Math.min(limit, this.value.length));
+                            for (let i = 0; i < items.length; i++)
+                                items[i] = format(this.type, this.value[i], this.le);
+                            return format_array(items, this.value.length > limit);
                         }
-                        case DdbType.string:
-                            return `'${this.value}'`;
                     }
-                    break;
+                }
             }
-            return this.value;
+            return String(this.value);
         })();
         return `${type}(${this.name ? `'${this.name}', ` : ''}${data})\n`;
     }
@@ -941,13 +1013,13 @@ class DdbObj {
             };
             switch (col.type) {
                 case DdbType.timestamp:
-                    col_.render = timestamp2str;
+                    col_.render = value => timestamp2str(value);
                     break;
                 case DdbType.date:
-                    col_.render = date2str;
+                    col_.render = value => date2str(value);
                     break;
                 case DdbType.ipaddr:
-                    col_.render = value => value.slice().reverse().join('.').replace(/^(0\.)+/, '');
+                    col_.render = value => ipaddr2str(value, this.le);
                     break;
             }
             return col_;
@@ -1005,6 +1077,127 @@ DdbObj.enc = new TextEncoder();
 DdbObj.symbol_bases = {};
 /** little endian (client) */
 DdbObj.le_client = Boolean(new Uint8Array(Uint32Array.of(1).buffer)[0]);
+function format(type, value, le) {
+    switch (type) {
+        case DdbType.bool:
+            return String((value === null || value === exports.nulls.int8) ?
+                null
+                :
+                    Boolean(value));
+        case DdbType.char:
+            return String((value === null || value === exports.nulls.int8) ?
+                null
+                :
+                    value);
+        case DdbType.short:
+            return String((value === null || value === exports.nulls.int16) ?
+                null
+                :
+                    value);
+        case DdbType.int:
+            return String((value === null || value === exports.nulls.int32) ?
+                null
+                :
+                    value);
+        case DdbType.long:
+            return (value === null || value === exports.nulls.int64) ?
+                'null'
+                :
+                    String(value);
+        case DdbType.date:
+            return (value === null || value === exports.nulls.int32) ?
+                'null'
+                :
+                    date2str(value);
+        case DdbType.month:
+            return (value === null || value === exports.nulls.int32) ?
+                'null'
+                :
+                    month2str(value);
+        case DdbType.time:
+            return (value === null || value === exports.nulls.int32) ?
+                'null'
+                :
+                    time2str(value);
+        case DdbType.minute:
+            return (value === null || value === exports.nulls.int32) ?
+                'null'
+                :
+                    minute2str(value);
+        case DdbType.second:
+            return (value === null || value === exports.nulls.int32) ?
+                'null'
+                :
+                    second2str(value);
+        case DdbType.datetime:
+            return (value === null || value === exports.nulls.int32) ?
+                'null'
+                :
+                    datetime2str(value);
+        case DdbType.timestamp:
+            return (value === null || value === exports.nulls.int64) ?
+                'null'
+                :
+                    timestamp2str(value);
+        case DdbType.nanotime:
+            return (value === null || value === exports.nulls.int64) ?
+                'null'
+                :
+                    nanotime2str(value);
+        case DdbType.nanotimestamp:
+            return (value === null || value === exports.nulls.int64) ?
+                'null'
+                :
+                    nanotimestamp2str(value);
+        case DdbType.float:
+            return (value === null || value === exports.nulls.float32) ?
+                'null'
+                :
+                    String(value);
+        case DdbType.double:
+            return (value === null || value === exports.nulls.double) ?
+                'null'
+                :
+                    String(value);
+        case DdbType.symbol:
+        case DdbType.string:
+            return value.quote('single');
+        case DdbType.uuid:
+            return uuid2str(value, le);
+        case DdbType.functiondef:
+            return value.quote('single');
+        case DdbType.handle:
+        case DdbType.code:
+            return value.quote('single');
+        case DdbType.datehour:
+            return (value === null || value === exports.nulls.int32) ?
+                'null'
+                :
+                    datehour2str(value);
+        case DdbType.ipaddr:
+            return ipaddr2str(value, le);
+        case DdbType.int128:
+            return int1282str(value, le);
+        case DdbType.blob:
+            return DdbObj.dec.decode(value.subarray(0, 1000)).quote('single');
+        case DdbType.complex:
+        case DdbType.point: {
+            let [x, y] = value;
+            if (x === exports.nulls.double)
+                x = null;
+            if (y === exports.nulls.double)
+                y = null;
+            return `(${String(x)}, ${String(y)})`;
+        }
+        case DdbType.duration: {
+            const { data, unit } = value;
+            return `${data}${DdbDurationUnit[unit]}`;
+        }
+        default:
+            return String(value);
+    }
+}
+exports.format = format;
 class DdbVoid extends DdbObj {
     constructor() {
         super({
@@ -1315,14 +1508,48 @@ class DdbTable extends DdbObj {
 }
 exports.DdbTable = DdbTable;
 function date2str(date, format = 'YYYY.MM.DD') {
-    return date === exports.nulls.int32 ?
+    return (date === null || date === exports.nulls.int32) ?
         ''
         :
             (0, dayjs_1.default)(exports.timezone_offset + 1000 * 3600 * 24 * date).format(format);
 }
 exports.date2str = date2str;
+function month2str(month) {
+    if (month === null || month === exports.nulls.int32)
+        return '';
+    if (month < 0)
+        return String(month);
+    let _month = month % 12;
+    let year = Math.floor(month / 12);
+    return `${String(year).padStart(4, '0')}.${String(_month + 1).padStart(2, '0')}`;
+}
+exports.month2str = month2str;
+function time2str(time, format = 'HH:mm:ss.SSS') {
+    return (time === null || time === exports.nulls.int32) ?
+        ''
+        :
+            (0, dayjs_1.default)(exports.timezone_offset + time)
+                .format(format);
+}
+exports.time2str = time2str;
+function minute2str(minute, format = 'HH:mm') {
+    return (minute === null || minute === exports.nulls.int32) ?
+        ''
+        :
+            (0, dayjs_1.default)(exports.timezone_offset + 60 * 1000 * minute)
+                .format(format);
+}
+exports.minute2str = minute2str;
+function second2str(second, format = 'HH:mm:ss') {
+    return (second === null || second === exports.nulls.int32) ?
+        ''
+        :
+            (0, dayjs_1.default)(exports.timezone_offset + 1000 * second)
+                .format(format);
+}
+exports.second2str = second2str;
 function datetime2str(datetime, format = 'YYYY.MM.DD HH:mm:ss') {
-    return datetime === exports.nulls.int32 ?
+    return (datetime === null || datetime === exports.nulls.int32) ?
         ''
         :
             (0, dayjs_1.default)(exports.timezone_offset + 1000 * datetime).format(format);
@@ -1335,12 +1562,19 @@ exports.datetime2str = datetime2str;
         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 ?
+    return (timestamp === null || timestamp === exports.nulls.int64) ?
         ''
         :
             (0, dayjs_1.default)(exports.timezone_offset + Number(timestamp)).format(format);
 }
 exports.timestamp2str = timestamp2str;
+function datehour2str(datehour, format = 'YYYY.MM.DD.HH') {
+    return (datehour === null || datehour === exports.nulls.int32) ?
+        ''
+        :
+            (0, dayjs_1.default)(exports.timezone_offset + 1000 * 3600 * datehour).format(format);
+}
+exports.datehour2str = datehour2str;
 /** 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?:
@@ -1356,6 +1590,19 @@ function str2timestamp(str, format = 'YYYY.MM.DD HH:mm:ss.SSS') {
         (0, dayjs_1.default)(str, format).valueOf());
 }
 exports.str2timestamp = str2timestamp;
+function nanotime2str(nanotime, format = 'HH:mm:ss.SSSSSSSSS') {
+    const i_second_start = format.indexOf('ss');
+    if (i_second_start === -1)
+        throw new Error('格式串必须包含秒的格式 (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('格式串必须包含纳秒的格式 (SSSSSSSSS)');
+    return ((0, dayjs_1.default)(exports.timezone_offset + (Number(nanotime) / 1000000)).format(format.slice(0, i_second_end)) +
+        format.slice(i_second_end, i_nanosecond_start) +
+        String(nanotime % 1000000000n).padStart(9, '0'));
+}
+exports.nanotime2str = nanotime2str;
 /** format nanotimestamp value (bigint) to string
     - nanotimestamp: bigint value
     - format?:
@@ -1364,7 +1611,7 @@ exports.str2timestamp = str2timestamp;
         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)
+    if (nanotimestamp === null || nanotimestamp === exports.nulls.int64)
         return '';
     const i_second_start = format.indexOf('ss');
     if (i_second_start === -1)
@@ -1375,7 +1622,7 @@ function nanotimestamp2str(nanotimestamp, format = 'YYYY.MM.DD HH:mm:ss.SSSSSSSS
         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));
+        String(nanotimestamp % 1000000000n).padStart(9, '0'));
 }
 exports.nanotimestamp2str = nanotimestamp2str;
 /** parse nano timestamp string to bigint value
@@ -1403,6 +1650,31 @@ function str2nanotimestamp(str, format = 'YYYY.MM.DD HH:mm:ss.SSSSSSSSS') {
             BigInt(str.slice(i_nanosecond_start, i_nanosecond_start + 9)));
 }
 exports.str2nanotimestamp = str2nanotimestamp;
+function ipaddr2str(buffer, le = true) {
+    let buf = buffer;
+    if (le)
+        buf = buffer.slice().reverse();
+    const i_non_zero = buf.findIndex(x => x);
+    if (i_non_zero !== -1 && i_non_zero < 12) // ipv6 (i_non_zero === -1 或 0 < i_non_zero < 12)
+        return [...buf].map(x => x.toString(16)
+            .padStart(2, '0')).join(':');
+    else // ipv4
+        return buf.subarray(12).join('.');
+}
+exports.ipaddr2str = ipaddr2str;
+function uuid2str(buffer, le = true) {
+    const str = int1282str(buffer, le);
+    return `${str.slice(0, 8)}-${str.slice(8, 12)}-${str.slice(12, 16)}-${str.slice(16, 20)}-${str.slice(20)}`;
+}
+exports.uuid2str = uuid2str;
+function int1282str(buffer, le = true) {
+    let buf = buffer;
+    if (le)
+        buf = buffer.slice().reverse();
+    return [...buf].map(x => x.toString(16)
+        .padStart(2, '0')).join('');
+}
+exports.int1282str = int1282str;
 class DDB {
     /**
         Initialize an instance of DolphinDB Client using the WebSocket URL
@@ -1809,5 +2081,4 @@ exports.DDB = DDB;
 /** little endian (client) */
 DDB.le_client = Boolean(new Uint8Array(Uint32Array.of(1).buffer)[0]);
 exports.ddb = window.ddb = new DDB();
-exports.default = exports.ddb;
 //# sourceMappingURL=browser.js.map