dolphindb 3.0.126 → 3.0.128

package/index.d.ts

@@ -399,10 +399,12 @@ export declare function formati(obj: DdbVectorObj, index: number, options?: Insp
 export interface ConvertOptions {
     /** `'string'` blob 类型数据的格式 */
     blob?: 'string' | 'binary';
-    /** timestamp 类型转换为字符串表示时显示到秒还是毫秒 */
+    /** `'string'` char 类型数据的格式: string 解析成 string[]，number 解析为 number[] */
+    char?: 'string' | 'number';
+    /** `'ms'` timestamp 类型转换为字符串表示时显示到秒还是毫秒 */
     timestamp?: 's' | 'ms';
 }
-export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, timestamp }?: ConvertOptions): string | number | bigint | boolean | Uint8Array | number[] | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array | BigInt64Array | string[] | Uint8Array[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | BigInt128Array | DdbObj<DdbValue>[] | IotVectorItemValue | DdbSymbolExtendedValue | DdbArrayVectorValue | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDecimal128VectorValue | DdbDurationVectorValue | DdbMatrixValue | DdbChartValue | DdbTensorValue;
+export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, char, timestamp }?: ConvertOptions): string | number | bigint | boolean | Uint8Array | Int32Array | BigInt64Array | string[] | Int8Array | Int16Array | Float32Array | Float64Array | Uint8Array[] | number[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDecimal128VectorValue | BigInt128Array | DdbSymbolExtendedValue | DdbArrayVectorValue | DdbMatrixValue | DdbObj<DdbValue>[] | IotVectorItemValue | DdbDurationVectorValue | DdbTensorValue | DdbChartValue;
 /** 转换一个向量到 js 原生数组 */
 export declare function converts(type: DdbType, value: DdbVectorValue, rows: number, le: boolean, options?: ConvertOptions): any[];
 export declare class DdbVoid extends DdbObj<undefined> {
@@ -421,7 +423,7 @@ export declare class DdbString extends DdbObj<string> {
     constructor(value: string);
 }
 export declare class DdbLong extends DdbObj<bigint> {
-    constructor(value: bigint | null);
+    constructor(value: bigint | number | null);
 }
 export declare class DdbDouble extends DdbObj<number> {
     constructor(value: number | null);
@@ -430,7 +432,10 @@ export declare class DdbDateTime extends DdbObj<number> {
     constructor(value: number | null);
 }
 export declare class DdbTimeStamp extends DdbObj<bigint> {
-    constructor(value: bigint | null);
+    /** @example
+        new DdbTimeStamp(new Date().getTime())
+        new DdbTimeStamp(dayjs().valueOf()) */
+    constructor(value?: bigint | null | number);
 }
 export declare class DdbNanoTimeStamp extends DdbObj<bigint> {
     constructor(value: bigint | null);

package/index.js

@@ -831,7 +831,7 @@ export class DdbObj {
                 for (let i = 1; i < length; i++) {
                     const sub_vector = anys[i];
                     const sub_type = sub_vector.type;
-                    sub_vecs.set(sub_type, converts(sub_type, sub_vector.data(), sub_vector.length, le));
+                    sub_vecs.set(sub_type, sub_vector.data());
                 }
                 return [
                     len,
@@ -1954,12 +1954,20 @@ export function formati(obj, index, options = {}) {
         }
     }
 }
-export function convert(type, value, le, { blob = 'string', timestamp = 'ms' } = {}) {
+export function convert(type, value, le, { blob = 'string', char = 'string', timestamp = 'ms' } = {}) {
     switch (type) {
         case DdbType.void:
             return value === DdbVoidType.null ? null : undefined;
         case DdbType.char:
-            return value === null || value === nulls.int8 ? '' : String.fromCharCode(value);
+            return char === 'string'
+                ? value === null || value === nulls.int8
+                    ? ''
+                    : // ascii printable
+                        // http://facweb.cs.depaul.edu/sjost/it212/documents/ascii-pr.htm
+                        (32 <= value && value <= 126)
+                            ? String.fromCharCode(value)
+                            : `\\${value}`
+                : value;
         case DdbType.bool:
             return value === null || value === nulls.int8 ? null : Boolean(value);
         case DdbType.short:
@@ -2157,6 +2165,8 @@ export class DdbString extends DdbObj {
 }
 export class DdbLong extends DdbObj {
     constructor(value) {
+        if (typeof value === 'number')
+            value = BigInt(value);
         super({
             form: DdbForm.scalar,
             type: DdbType.long,
@@ -2183,7 +2193,15 @@ export class DdbDateTime extends DdbObj {
     }
 }
 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,