dolphindb 0.0.10 → 0.0.13

package/README.zh.md

@@ -46,6 +46,7 @@ npm install dolphindb
 ```ts
 import { DDB } from 'dolphindb'
 // 已有的使用 CommonJS 模块的项目的导入方法为 const { DDB } = require('dolphindb')
+// 在浏览器中使用: import { DDB } form 'dolphindb/browser.js'
 
 // 创建数据库对象，初始化 WebSocket 连接地址
 let ddb = new DDB('ws://127.0.0.1:8848')

package/browser.d.ts

@@ -151,6 +151,9 @@ export declare class DdbVoid extends DdbObj<undefined> {
 export declare class DdbBool extends DdbObj<boolean> {
     constructor(value: boolean);
 }
+export declare class DdbChar extends DdbObj<string> {
+    constructor(value: string);
+}
 export declare class DdbInt extends DdbObj<number> {
     constructor(value: number);
 }
@@ -163,6 +166,15 @@ export declare class DdbLong extends DdbObj<bigint> {
 export declare class DdbDouble extends DdbObj<number> {
     constructor(value: number);
 }
+export declare class DdbDateTime extends DdbObj<number> {
+    constructor(value: number);
+}
+export declare class DdbTimeStamp extends DdbObj<bigint> {
+    constructor(value: bigint);
+}
+export declare class DdbNanoTimeStamp extends DdbObj<bigint> {
+    constructor(value: bigint);
+}
 export declare class DdbVectorInt extends DdbObj<Int32Array> {
     constructor(value: number[], name?: string);
 }
@@ -181,8 +193,16 @@ export declare class DdbPair extends DdbObj<Int32Array> {
 export declare class DdbFunction extends DdbObj<DdbFunctionDefValue> {
     constructor(name: string, type: DdbFunctionType);
 }
-export declare function date2str(date: number): string;
+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;
+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`
+        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 class DDB {
     /** 当前的 session id (http 或 tcp) */
     sid: string;

package/browser.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ddb = exports.DDB = exports.timestamp2str = exports.date2str = exports.DdbFunction = exports.DdbPair = exports.DdbVectorAny = exports.DdbVectorDouble = exports.DdbVectorString = exports.DdbVectorInt = exports.DdbDouble = exports.DdbLong = exports.DdbString = exports.DdbInt = 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.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"));
+dayjs_1.default.extend(customParseFormat_js_1.default);
 require("xshell/prototype.browser");
 const utils_browser_1 = require("xshell/utils.browser");
 var DdbForm;
@@ -113,7 +115,7 @@ class DdbObj {
                     le,
                     form,
                     type,
-                    length: 2 + length,
+                    length: i_data + length,
                     value,
                 });
             }
@@ -121,7 +123,7 @@ class DdbObj {
             case DdbForm.pair:
             case DdbForm.set: {
                 let vector = this.parse_vector(buf_data, le, type);
-                vector.length += 2;
+                vector.length += i_data;
                 vector.form = form;
                 return vector;
             }
@@ -152,17 +154,17 @@ class DdbObj {
                 let i_start = i_items_start + len_items;
                 for (let i = 0; i < cols; i++) {
                     const type = buf_data[i_start];
-                    const i_vector_head = i_start + 2;
-                    let col = this.parse_vector(buf_data.subarray(i_vector_head), le, type);
+                    let col = this.parse_vector(buf_data.subarray(i_start + 2), le, type);
+                    col.length += 2;
                     col.name = colnames[i];
                     value[i] = col;
-                    i_start = i_vector_head + col.length;
+                    i_start += col.length;
                 }
                 return new this({
                     le,
                     form,
                     type,
-                    length: i_start,
+                    length: i_data + i_start,
                     name,
                     rows,
                     cols,
@@ -185,7 +187,7 @@ class DdbObj {
                     le,
                     form,
                     type,
-                    length: 2 + keys.length + values.length,
+                    length: i_data + keys.length + values.length,
                     rows: keys.rows,
                     cols: 2,
                     value: [
@@ -218,7 +220,7 @@ class DdbObj {
                     le,
                     form,
                     type,
-                    length: 11 + len_items,
+                    length: i_data + 11 + len_items,
                     rows,
                     cols,
                     datatype,
@@ -230,7 +232,7 @@ class DdbObj {
                     le,
                     form,
                     type,
-                    length: buf_data.length,
+                    length: i_data + buf_data.length,
                     value: buf_data
                 });
         }
@@ -786,7 +788,7 @@ class DdbObj {
                 case DdbForm.pair:
                     return `pair<${tname}>`;
                 case DdbForm.set:
-                    return `set<${tname}>`;
+                    return `set<${tname}>[${this.rows}]`;
                 case DdbForm.table:
                     return `table[${this.rows} rows][${this.cols} cols]`;
                 case DdbForm.dict:
@@ -827,16 +829,23 @@ class DdbObj {
         });
     }
     to_rows() {
+        if (this.form !== DdbForm.table)
+            throw new Error('this.form is not DdbForm.table, cannot call to_rows');
         let rows = new Array(this.rows);
         for (let i = 0; i < this.rows; i++) {
             let row = {};
             for (let j = 0; j < this.cols; j++) {
-                const c = this.value[j];
-                if (c.type === DdbType.ipaddr) {
-                    row[c.name] = c.value.subarray(16 * i, 16 * (i + 1));
-                    continue;
+                const { type, name, value } = this.value[j]; // column
+                switch (type) {
+                    case DdbType.bool:
+                        row[name] = Boolean(value[i]);
+                        break;
+                    case DdbType.ipaddr:
+                        row[name] = value.subarray(16 * i, 16 * (i + 1));
+                        break;
+                    default:
+                        row[name] = value[i];
                 }
-                row[c.name] = c.value[i];
             }
             rows[i] = row;
         }
@@ -880,6 +889,17 @@ class DdbBool extends DdbObj {
     }
 }
 exports.DdbBool = DdbBool;
+class DdbChar extends DdbObj {
+    constructor(value) {
+        super({
+            form: DdbForm.scalar,
+            type: DdbType.char,
+            length: 1,
+            value,
+        });
+    }
+}
+exports.DdbChar = DdbChar;
 class DdbInt extends DdbObj {
     constructor(value) {
         super({
@@ -924,6 +944,39 @@ class DdbDouble extends DdbObj {
     }
 }
 exports.DdbDouble = DdbDouble;
+class DdbDateTime extends DdbObj {
+    constructor(value) {
+        super({
+            form: DdbForm.scalar,
+            type: DdbType.datetime,
+            length: 4,
+            value
+        });
+    }
+}
+exports.DdbDateTime = DdbDateTime;
+class DdbTimeStamp extends DdbObj {
+    constructor(value) {
+        super({
+            form: DdbForm.scalar,
+            type: DdbType.timestamp,
+            length: 8,
+            value
+        });
+    }
+}
+exports.DdbTimeStamp = DdbTimeStamp;
+class DdbNanoTimeStamp extends DdbObj {
+    constructor(value) {
+        super({
+            form: DdbForm.scalar,
+            type: DdbType.nanotimestamp,
+            length: 8,
+            value
+        });
+    }
+}
+exports.DdbNanoTimeStamp = DdbNanoTimeStamp;
 class DdbVectorInt extends DdbObj {
     constructor(value, name) {
         super({
@@ -1004,13 +1057,20 @@ class DdbFunction extends DdbObj {
     }
 }
 exports.DdbFunction = DdbFunction;
-function date2str(date) {
+function date2str(date, format = 'YYYY.MM.DD') {
     return date === exports.nulls.int32 ?
         ''
         :
-            (0, dayjs_1.default)(exports.timezone_offset + 1000 * 3600 * 24 * date).format('YYYY.MM.DD');
+            (0, dayjs_1.default)(exports.timezone_offset + 1000 * 3600 * 24 * date).format(format);
 }
 exports.date2str = date2str;
+function datetime2str(datetime, format = 'YYYY.MM.DD HH:mm:ss') {
+    return datetime === exports.nulls.int32 ?
+        ''
+        :
+            (0, dayjs_1.default)(exports.timezone_offset + 1000 * datetime).format(format);
+}
+exports.datetime2str = datetime2str;
 function timestamp2str(timestamp) {
     return timestamp === exports.nulls.int64 ?
         ''
@@ -1018,6 +1078,29 @@ function timestamp2str(timestamp) {
             (0, dayjs_1.default)(exports.timezone_offset + Number(timestamp)).format('YYYY.MM.DD HH:mm:ss.SSS');
 }
 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}`;
+}
+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`
+        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') {
+    if (!str)
+        return exports.nulls.int64;
+    if (str.length - format.length !== 9)
+        throw new Error('nanotimestamp 字符串长度减格式串长度应该等于 9');
+    return (BigInt(-exports.timezone_offset +
+        (0, dayjs_1.default)(str.slice(0, format.length), format).valueOf()) * 1000000n
+        +
+            BigInt(str.slice(format.length)));
+}
+exports.str2nanotimestamp = str2nanotimestamp;
 class DDB {
     /**
         Initialize an instance of DolphinDB Client using the WebSocket URL