dolphindb 2.0.519 → 2.0.520

package/index.d.ts

@@ -249,20 +249,28 @@ export declare class DdbSetString extends DdbObj<string[]> {
 export declare class DdbTable extends DdbObj<DdbObj[]> {
     constructor(columns: DdbObj[], name?: string);
 }
-export declare function date2str(date: number, format?: string): string;
+export declare function date2ms(date: number | null): number;
+export declare function date2str(date: number | null, format?: string): string;
+export declare function month2ms(month: number | null): number | null;
 export declare function month2str(month: number | null): string;
-export declare function time2str(time: number, format?: string): string;
+export declare function time2ms(time: number | null): number | null;
+export declare function time2str(time: number | null, format?: string): string;
+export declare function minute2ms(minute: number | null): number | null;
 export declare function minute2str(minute: number | null, format?: string): string;
+export declare function second2ms(second: number | null): number | null;
 export declare function second2str(second: number | null, format?: string): string;
-export declare function datetime2str(datetime: number, format?: string): string;
+export declare function datetime2ms(datetime: number | null): number | null;
+export declare function datetime2str(datetime: number | null, format?: string): string;
+export declare function timestamp2ms(timestamp: bigint | null): number | null;
 /** 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
 */
-export declare function timestamp2str(timestamp: bigint, format?: string): string;
-export declare function datehour2str(datehour: number, format?: string): string;
+export declare function timestamp2str(timestamp: bigint | null, format?: string): string;
+export declare function datehour2ms(datehour: number | null): number | null;
+export declare function datehour2str(datehour: number | null, format?: string): string;
 /** parse timestamp string to bigint value
     - str: timestamp string, If it is an empty string or 'null', it will return the corresponding empty value (nulls.int64)
     - format?:
@@ -270,7 +278,9 @@ export declare function datehour2str(datehour: number, format?: string): string;
         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;
+export declare function nanotime2ns(nanotime: bigint | null): bigint | null;
+export declare function nanotime2str(nanotime: bigint | null, format?: string): string;
+export declare function nanotimestamp2ns(nanotimestamp: bigint | null): bigint | null;
 /** format nanotimestamp value (bigint) to string
     - nanotimestamp: bigint value
     - format?:
@@ -278,7 +288,7 @@ export declare function nanotime2str(nanotime: bigint, format?: string): string;
         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 nanotimestamp2str(nanotimestamp: bigint, format?: string): string;
+export declare function nanotimestamp2str(nanotimestamp: bigint | null, format?: string): string;
 /** parse nano timestamp string to bigint value
     - str: nano timestamp string, If it is an empty string or 'null', it will return the corresponding empty value (nulls.int64)
     - format?:

package/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.nanotimestamp2str = exports.nanotimestamp2ns = 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.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.DDB = exports.int1282str = exports.uuid2str = exports.ipaddr2str = exports.str2nanotimestamp = void 0;
 const tslib_1 = require("tslib");
 const ws_1 = require("ws");
 const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
@@ -1536,13 +1537,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';
@@ -1553,37 +1568,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?:
@@ -1594,9 +1641,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'
@@ -1619,6 +1673,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';
@@ -1636,6 +1694,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?: