dolphindb 2.0.514 → 2.0.517

package/README.md

@@ -128,12 +128,12 @@ class DdbObj <T extends DdbValue = DdbValue> {
     /** 2nd dimension */
     cols?: number
     
-    /** the type of the value in matrix (only matrix has this field) */
-    datatype?: DdbType
-    
     /** the actual data. Different DdbForm, DdbType use different types in DdbValue to represent actual data */
     value: T
     
+    /** raw binary data, only top-level objects generated by parse_message when parse_object is false have this attribute */
+    buffer?: Uint8Array
+    
     constructor (data: Partial<DdbObj> & { form: DdbForm, type: DdbType, length: number }) {
         Object.assign(this, data)
     }

package/README.zh.md

@@ -129,12 +129,12 @@ class DdbObj <T extends DdbValue = DdbValue> {
     /** 第 2 维 */
     cols?: number
     
-    /** matrix 中值的类型，仅 matrix 才有 */
-    datatype?: DdbType
-    
     /** 实际数据。不同的 DdbForm, DdbType 使用 DdbValue 中不同的类型来表示实际数据 */
     value: T
     
+    /** 原始二进制数据，仅在 parse_object 为 false 时通过 parse_message 生成的顶层对象有这个属性 */
+    buffer?: Uint8Array
+    
     constructor (data: Partial<DdbObj> & { form: DdbForm, type: DdbType, length: number }) {
         Object.assign(this, data)
     }

package/browser.d.ts

@@ -265,7 +265,7 @@ export declare function datetime2str(datetime: number, format?: string): string;
 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)
+    - str: timestamp string, If it is an empty string or 'null', 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
@@ -281,14 +281,14 @@ export declare function nanotime2str(nanotime: bigint, format?: string): string;
 */
 export declare function nanotimestamp2str(nanotimestamp: bigint, format?: string): string;
 /** parse nano timestamp string to bigint value
-    - str: nano timestamp string, If it is an empty string, it will return the corresponding empty value (nulls.int64)
+    - str: nano timestamp string, If it is an empty string or 'null', 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
 */
 export declare function str2nanotimestamp(str: string, format?: string): bigint;
-export declare function ipaddr2str(buffer: Uint8Array, le?: boolean): string;
+export declare function ipaddr2str(buffer: Uint8Array, le?: boolean, ipv6?: boolean): string;
 export declare function uuid2str(buffer: Uint8Array, le?: boolean): string;
 export declare function int1282str(buffer: Uint8Array, le?: boolean): string;
 export declare class DDB {

package/browser.js

@@ -5,6 +5,8 @@ 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"));
 dayjs_1.default.extend(customParseFormat_js_1.default);
+const ipaddr_js_1 = tslib_1.__importDefault(require("ipaddr.js"));
+const { fromByteArray: buf2ipaddr } = ipaddr_js_1.default;
 require("xshell/prototype.browser");
 const utils_browser_1 = require("xshell/utils.browser");
 const net_browser_js_1 = require("xshell/net.browser.js");
@@ -913,7 +915,7 @@ class DdbObj {
                 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}r][${this.cols}c]`;
+                    return `matrix<${tname}>[${this.rows}r][${this.cols}c]`;
                 default:
                     return `${DdbForm[this.form]} ${tname}`;
             }
@@ -1088,7 +1090,12 @@ function format(type, value, le) {
             return String((value === null || value === exports.nulls.int8) ?
                 null
                 :
-                    value);
+                    // ascii printable
+                    // http://facweb.cs.depaul.edu/sjost/it212/documents/ascii-pr.htm
+                    (32 <= value && value <= 126) ?
+                        String.fromCharCode(value).quote()
+                        :
+                            value);
         case DdbType.short:
             return String((value === null || value === exports.nulls.int16) ?
                 null
@@ -1179,8 +1186,10 @@ function format(type, 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:
+            return (value.length > 100 ?
+                DdbObj.dec.decode(value.subarray(0, 98)) + '…'
+                :
+                    DdbObj.dec.decode(value)).quote('single');
         case DdbType.point: {
             let [x, y] = value;
             if (x === exports.nulls.double)
@@ -1189,6 +1198,14 @@ function format(type, value, le) {
                 y = null;
             return `(${String(x)}, ${String(y)})`;
         }
+        case DdbType.complex: {
+            let [x, y] = value;
+            if (x === exports.nulls.double)
+                x = null;
+            if (y === exports.nulls.double)
+                y = null;
+            return `${String(x)}+${String(y)}i`;
+        }
         case DdbType.duration: {
             const { data, unit } = value;
             return `${data}${DdbDurationUnit[unit]}`;
@@ -1509,32 +1526,32 @@ class DdbTable extends DdbObj {
 exports.DdbTable = DdbTable;
 function date2str(date, format = 'YYYY.MM.DD') {
     return (date === null || date === exports.nulls.int32) ?
-        ''
+        'null'
         :
             (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 '';
+        return 'null';
     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')}`;
+    const _month = month % 12;
+    const year = Math.trunc(month / 12);
+    return `${String(year).padStart(4, '0')}.${String(_month + 1).padStart(2, '0')}M`;
 }
 exports.month2str = month2str;
 function time2str(time, format = 'HH:mm:ss.SSS') {
     return (time === null || time === exports.nulls.int32) ?
-        ''
+        'null'
         :
             (0, dayjs_1.default)(exports.timezone_offset + time)
                 .format(format);
 }
 exports.time2str = time2str;
-function minute2str(minute, format = 'HH:mm') {
+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);
@@ -1542,7 +1559,7 @@ function minute2str(minute, format = 'HH:mm') {
 exports.minute2str = minute2str;
 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);
@@ -1550,7 +1567,7 @@ function second2str(second, format = 'HH:mm:ss') {
 exports.second2str = second2str;
 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);
 }
@@ -1563,26 +1580,26 @@ exports.datetime2str = datetime2str;
 */
 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);
 }
 exports.timestamp2str = timestamp2str;
-function datehour2str(datehour, format = 'YYYY.MM.DD.HH') {
+function datehour2str(datehour, format = 'YYYY.MM.DDTHH') {
     return (datehour === null || datehour === exports.nulls.int32) ?
-        ''
+        'null'
         :
             (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)
+    - str: timestamp string, If it is an empty string or 'null', 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)
+    if (!str || str === 'null')
         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');
@@ -1591,6 +1608,10 @@ function str2timestamp(str, format = 'YYYY.MM.DD HH:mm:ss.SSS') {
 }
 exports.str2timestamp = str2timestamp;
 function nanotime2str(nanotime, format = 'HH:mm:ss.SSSSSSSSS') {
+    if (nanotime === null || nanotime === exports.nulls.int64)
+        return 'null';
+    if (nanotime < 0n)
+        return String(nanotime);
     const i_second_start = format.indexOf('ss');
     if (i_second_start === -1)
         throw new Error('格式串必须包含秒的格式 (ss)');
@@ -1611,8 +1632,14 @@ exports.nanotime2str = nanotime2str;
         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') {
+    // tests:
+    // nanotimestamp2str(0n)
+    // nanotimestamp2str(-1n)
+    // nanotimestamp2str(-9_9999_9999n)
+    // nanotimestamp2str(-10_0000_0000n)
+    // nanotimestamp2str(-10_0000_0001n)
     if (nanotimestamp === null || nanotimestamp === exports.nulls.int64)
-        return '';
+        return 'null';
     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)');
@@ -1620,20 +1647,27 @@ function nanotimestamp2str(nanotimestamp, format = 'YYYY.MM.DD HH:mm:ss.SSSSSSSS
     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)) +
+    const remainder = nanotimestamp % 1000000000n;
+    const borrow = remainder < 0n;
+    return ((0, dayjs_1.default)(exports.timezone_offset +
+        // 去掉 9 位的纳秒部分，转化为毫秒
+        Number((nanotimestamp - remainder + (borrow ? -1000000000n : 0n)) / 1000000n)).format(format.slice(0, i_second_end)) +
         format.slice(i_second_end, i_nanosecond_start) +
-        String(nanotimestamp % 1000000000n).padStart(9, '0'));
+        String(borrow ?
+            (remainder + 1000000000n) % 1000000000n
+            :
+                remainder).padStart(9, '0'));
 }
 exports.nanotimestamp2str = nanotimestamp2str;
 /** parse nano timestamp string to bigint value
-    - str: nano timestamp string, If it is an empty string, it will return the corresponding empty value (nulls.int64)
+    - str: nano timestamp string, If it is an empty string or 'null', 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.SSSSSSSSS') {
-    if (!str)
+    if (!str || str === 'null')
         return exports.nulls.int64;
     if (str.length !== format.length)
         throw new Error('nanotimestamp string length is not equal to format string length');
@@ -1650,14 +1684,14 @@ 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) {
+function ipaddr2str(buffer, le = true, ipv6) {
     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(':');
+    if (ipv6 ||
+        i_non_zero !== -1 && i_non_zero < 12) // ipv6
+        return buf2ipaddr([...buf]).toString();
     else // ipv4
         return buf.subarray(12).join('.');
 }