dolphindb 3.0.205 → 3.0.209

package/i18n/dict.json

@@ -106,5 +106,8 @@
     },
     "iotany 的 meta vector 长度至少为 2": {
         "en": "The length of the iotany meta vector is at least 2"
+    },
+    "value 不能转换为 {{classname}}": {
+        "en": "value cannot be converted to {{classname}}"
     }
 }

package/index.d.ts

@@ -1,4 +1,5 @@
 import type { InspectOptions as UtilInspectOptions } from 'util';
+import { type Dayjs } from 'dayjs';
 import { inspect, Lock, type WebSocket, type WebSocketConnectionError } from 'xshell';
 export declare const nulls: {
     readonly int8: -128;
@@ -406,7 +407,7 @@ export interface ConvertOptions {
     /** `'ms'` timestamp 类型转换为字符串表示时显示到秒还是毫秒 */
     timestamp?: 's' | 'ms';
 }
-export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, char, timestamp }?: ConvertOptions): string | number | bigint | boolean | string[] | number[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDecimal128VectorValue | BigInt128Array | DdbSymbolExtendedValue | DdbArrayVectorValue | DdbMatrixValue | Uint8Array<ArrayBufferLike> | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | IotVectorItemValue | DdbDurationVectorValue | DdbTensorValue | DdbChartValue;
+export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, char, timestamp }?: ConvertOptions): string | number | bigint | boolean | number[] | string[] | Uint8Array<ArrayBufferLike> | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | BigInt128Array | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | IotVectorItemValue | DdbSymbolExtendedValue | DdbArrayVectorValue | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDecimal128VectorValue | DdbDurationVectorValue | DdbMatrixValue | DdbChartValue | DdbTensorValue;
 /** 转换一个向量到 js 原生数组 */
 export declare function converts(type: DdbType, value: DdbVectorValue, rows: number, le: boolean, options?: ConvertOptions): any[] | Uint8Array;
 export declare class DdbVoid extends DdbObj<undefined> {
@@ -431,16 +432,16 @@ export declare class DdbDouble extends DdbObj<number> {
     constructor(value: number | null);
 }
 export declare class DdbDateTime extends DdbObj<number> {
-    constructor(value: number | null);
+    constructor(value?: null | number | string | Date | Dayjs);
 }
 export declare class DdbTimeStamp extends DdbObj<bigint> {
-    /** @example
-        new DdbTimeStamp(new Date().getTime())
-        new DdbTimeStamp(dayjs().valueOf()) */
-    constructor(value?: bigint | null | number);
+    constructor(value?: null | number | string | Date | Dayjs);
 }
 export declare class DdbNanoTimeStamp extends DdbObj<bigint> {
-    constructor(value: bigint | null);
+    constructor(value?: null | number | string | Date | Dayjs);
+}
+export declare class DdbDate extends DdbObj<number> {
+    constructor(value?: null | number | string | Date | Dayjs);
 }
 export declare class DdbBlob extends DdbObj<Uint8Array> {
     constructor(value: Uint8Array | ArrayBuffer);

package/index.js

@@ -1,9 +1,9 @@
-import dayjs from 'dayjs';
+import { default as dayjs } from 'dayjs';
 import DayjsCustomParseFormat from 'dayjs/plugin/customParseFormat.js';
 dayjs.extend(DayjsCustomParseFormat);
 import ipaddrjs from 'ipaddr.js';
 const { fromByteArray: buf2ipaddr } = ipaddrjs;
-import { concat, assert, inspect, typed_array_to_buffer, connect_websocket, Lock, genid, seq, zip_object, WebSocketOpen, WebSocketClosed, WebSocketClosing, decode, delay } from 'xshell';
+import { concat, assert, inspect, typed_array_to_buffer, connect_websocket, Lock, genid, seq, zip_object, WebSocketOpen, WebSocketClosed, WebSocketClosing, decode, delay, check } from 'xshell';
 import { t } from "./i18n/index.js";
 export const nulls = {
     int8: -0x80, // -128
@@ -2195,24 +2195,16 @@ export class DdbDateTime extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.datetime,
-            value
+            value: get_ddb_time_value('DdbDateTime', value)
         });
     }
 }
 export class DdbTimeStamp extends DdbObj {
-    /** @example
-        new DdbTimeStamp(new Date().getTime())
-        new DdbTimeStamp(dayjs().valueOf()) */
     constructor(value) {
-        if (value === undefined)
-            value = new Date().getTime();
-        if (typeof value === 'number')
-            value = BigInt(-(1000 * 60 * new Date(value).getTimezoneOffset()) +
-                value);
         super({
             form: DdbForm.scalar,
             type: DdbType.timestamp,
-            value
+            value: get_ddb_time_value('DdbTimeStamp', value)
         });
     }
 }
@@ -2221,10 +2213,46 @@ export class DdbNanoTimeStamp extends DdbObj {
         super({
             form: DdbForm.scalar,
             type: DdbType.nanotimestamp,
-            value
+            value: get_ddb_time_value('DdbNanoTimeStamp', value)
         });
     }
 }
+export class DdbDate extends DdbObj {
+    constructor(value) {
+        super({
+            form: DdbForm.scalar,
+            type: DdbType.date,
+            value: get_ddb_time_value('DdbDate', value)
+        });
+    }
+}
+function get_ddb_time_value(classname, value) {
+    if (value === null)
+        return null;
+    if (classname === 'DdbNanoTimeStamp' && typeof value === 'string')
+        return str2nanotimestamp(value);
+    let date;
+    if (value === undefined)
+        date = new Date();
+    else if (typeof value === 'number' || typeof value === 'string')
+        date = new Date(value);
+    else if (value instanceof Date)
+        date = value;
+    else if (dayjs.isDayjs(value))
+        date = new Date(value.valueOf());
+    else
+        throw new Error(t('value 不能转换为 {{classname}}', { classname }));
+    switch (classname) {
+        case 'DdbDateTime':
+            return (date.getTime() - 1000 * 60 * date.getTimezoneOffset()) / 1000;
+        case 'DdbTimeStamp':
+            return BigInt(date.getTime() - 1000 * 60 * date.getTimezoneOffset());
+        case 'DdbNanoTimeStamp':
+            return BigInt(date.getTime() - 1000 * 60 * date.getTimezoneOffset()) * 1000000n;
+        case 'DdbDate':
+            return Math.floor((date.getTime() - 1000 * 60 * date.getTimezoneOffset()) / (1000 * 3600 * 24));
+    }
+}
 export class DdbBlob extends DdbObj {
     constructor(value) {
         assert(value, t('new DdbBlob 不能传空的 value'));
@@ -2527,7 +2555,7 @@ export function datetime2ms(datetime) {
     if (datetime === null || datetime === nulls.int32)
         return null;
     const date = new Date(1000 * datetime);
-    return new Date(`${_datetime_formatter.format(date)}.${date.getUTCMilliseconds()}`).valueOf();
+    return new Date(`${_datetime_formatter.format(date)}.${String(date.getUTCMilliseconds()).padStart(3, '0')}`).valueOf();
 }
 export function datetime2str(datetime, format = 'YYYY.MM.DD HH:mm:ss') {
     return (datetime === null || datetime === nulls.int32) ?
@@ -2540,7 +2568,7 @@ export function timestamp2ms(timestamp) {
     if (timestamp === null || timestamp === nulls.int64)
         return null;
     const date = new Date(Number(timestamp));
-    return new Date(`${_datetime_formatter.format(date)}.${date.getUTCMilliseconds()}`).valueOf();
+    return new Date(`${_datetime_formatter.format(date)}.${String(date.getUTCMilliseconds()).padStart(3, '0')}`).valueOf();
 }
 /** format timestamp (bigint) to string
     - timestamp: bigint value
@@ -2602,7 +2630,7 @@ export function nanotimestamp2ns(nanotimestamp) {
     if (nanotimestamp === null || nanotimestamp === nulls.int64)
         return null;
     const date = new Date(Number(nanotimestamp / 1000000n));
-    return BigInt(new Date(`${_datetime_formatter.format(date)}.${date.getUTCMilliseconds()}`).valueOf()) * 1000000n + nanotimestamp % 1000000n;
+    return BigInt(new Date(`${_datetime_formatter.format(date)}.${String(date.getUTCMilliseconds()).padStart(3, '0')}`).valueOf()) * 1000000n + nanotimestamp % 1000000n;
 }
 /** format nanotimestamp value (bigint) to string
     - nanotimestamp: bigint value
@@ -2647,12 +2675,12 @@ export function nanotimestamp2str(nanotimestamp, format = 'YYYY.MM.DD HH:mm:ss.S
 export function str2nanotimestamp(str, format = 'YYYY.MM.DD HH:mm:ss.SSSSSSSSS') {
     if (!str || str === 'null')
         return nulls.int64;
-    assert(str.length === format.length, t('nanotimestamp 字符串长度必须等于格式串长度'));
+    check(str.length === format.length, t('nanotimestamp 字符串长度必须等于格式串长度'));
     const i_second_start = format.indexOf('ss');
-    assert(i_second_start !== -1, t('格式串必须包含秒的格式 (ss)'));
+    check(i_second_start !== -1, t('格式串必须包含秒的格式 (ss)'));
     const i_second_end = i_second_start + 2;
     const i_nanosecond_start = format.indexOf('SSSSSSSSS', i_second_end);
-    assert(i_nanosecond_start !== -1, t('格式串必须包含纳秒的格式 (SSSSSSSSS)'));
+    check(i_nanosecond_start !== -1, t('格式串必须包含纳秒的格式 (SSSSSSSSS)'));
     const ms = dayjs(str.slice(0, i_second_end), format.slice(0, i_second_end)).valueOf();
     return (BigInt(-(1000 * 60 * new Date(ms).getTimezoneOffset()) +
         ms) * 1000000n