@cloudbase/node-sdk 3.16.0 → 3.17.0-alpha.0

package/dist/utils/tcbdbapirequester.js

@@ -22,6 +22,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TcbDBApiHttpRequester = void 0;
 const tcbapicaller = __importStar(require("./tcbapirequester"));
@@ -36,9 +47,10 @@ class TcbDBApiHttpRequester {
        * @param opts  - 可选配置项
        */
     async send(api, data, opts) {
-        const params = Object.assign(Object.assign({}, data), { action: api });
+        const _a = this.config, { instance, database } = _a, config = __rest(_a, ["instance", "database"]);
+        const params = Object.assign(Object.assign({}, data), { action: api, instance, database });
         return await tcbapicaller.request({
-            config: this.config,
+            config,
             params,
             method: 'post',
             opts,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/node-sdk",
-  "version": "3.16.0",
+  "version": "3.17.0-alpha.0",
   "description": "tencent cloud base server sdk for node.js",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
@@ -43,7 +43,7 @@
   "dependencies": {
     "@cloudbase/ai": "^2.23.0",
     "@cloudbase/app": "^2.23.0",
-    "@cloudbase/database": "1.4.2",
+    "@cloudbase/database": "1.4.3-alpha.0",
     "@cloudbase/signature-nodejs": "2.2.0",
     "@cloudbase/types": "^2.23.0",
     "@cloudbase/wx-cloud-client-sdk": "1.7.1",

package/src/cloudbase.ts

@@ -36,7 +36,8 @@ import {
   IReportData,
 
   Extension,
-  ICallApisOptions
+  ICallApisOptions,
+  ICloudBaseDBConfig
 } from '../types'
 
 import { auth } from './auth'
@@ -250,7 +251,7 @@ export class CloudBase {
     return auth(this)
   }
 
-  public database(dbConfig: ICloudBaseConfig = {}) {
+  public database(dbConfig: ICloudBaseDBConfig = {}) {
     return newDb(this, dbConfig)
   }
 

package/src/utils/tcbdbapirequester.ts

@@ -1,10 +1,10 @@
 import * as tcbapicaller from './tcbapirequester'
-import { ICloudBaseConfig, ICustomReqOpts } from '../../types'
+import { ICustomReqOpts, ICloudBaseDBConfig } from '../../types'
 
 export class TcbDBApiHttpRequester {
-  private readonly config: ICloudBaseConfig
+  private readonly config: ICloudBaseDBConfig
 
-  public constructor(config: ICloudBaseConfig) {
+  public constructor(config: ICloudBaseDBConfig) {
     this.config = config
   }
 
@@ -15,10 +15,11 @@ export class TcbDBApiHttpRequester {
      * @param opts  - 可选配置项
      */
   public async send(api: string, data: any, opts?: ICustomReqOpts): Promise<any> {
-    const params = { ...data, action: api }
+    const { instance, database, ...config } = this.config
+    const params = { ...data, action: api, instance, database }
 
     return await tcbapicaller.request({
-      config: this.config,
+      config,
       params,
       method: 'post',
       opts,

package/types/index.d.ts

@@ -248,6 +248,19 @@ export interface IBaseResult {
   requestId?: string
 }
 
+/* ********************************** database ********************************** */
+
+export interface ICloudBaseDBConfig extends ICloudBaseConfig {
+  /**
+   * 数据库实例
+   */
+  instance?: string
+  /**
+   * 数据库名称
+   */
+  database?: string
+}
+
 /* ********************************** storage ********************************** */
 
 export interface IUploadFileOptions {
@@ -521,7 +534,7 @@ export declare class CloudBase {
   /**
    * database - 获取云数据库实例
    */
-  database(dbConfig: ICloudBaseConfig = {}): Db
+  database(dbConfig: ICloudBaseDBConfig = {}): Db
 
   /**
    * callFunction - 调用云函数