dolphindb 0.0.14 → 0.0.15

package/browser.d.ts

@@ -195,11 +195,33 @@ export declare class DdbFunction extends DdbObj<DdbFunctionDefValue> {
 }
 export declare function date2str(date: number, format?: string): string;
 export declare function datetime2str(datetime: number, format?: string): string;
-export declare function timestamp2str(timestamp: bigint): string;
+/** 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;
+/** 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
+*/
+export declare function str2timestamp(str: string, format?: string): bigint;
+/** 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
+*/
 export declare function nanotimestamp2str(nanotimestamp: bigint, format?: string): string;
 /** parse nano timestamp string to bigint value
-    - str: nano timestamp string, 如果为空字符串会返回对应的空值 (nulls.int64)
-    - format?: Format string up to and including seconds of the passed string, default is `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
 */
 export declare function str2nanotimestamp(str: string, format?: string): bigint;

package/browser.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ddb = 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.DdbType = exports.DdbForm = void 0;
+exports.ddb = 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.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"));
@@ -1076,34 +1076,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?: Format string up to and including seconds of the passed string, default is `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 {