@cloudbase/wx-cloud-client-sdk 1.5.0 → 1.6.0

package/lib/index.d.ts

@@ -1,6 +1,9 @@
 import { CloudBaseInstance, ExtendedCloudBaseInstance } from './types';
 import { generateHTTPClient } from './orm/http-orm-client';
-export declare function init(cloud: CloudBaseInstance): ExtendedCloudBaseInstance;
+export declare function init(cloud: CloudBaseInstance, options?: {
+    baseUrl?: string;
+    sqlBaseUrl?: string;
+}): ExtendedCloudBaseInstance;
 export * from './types';
 export { generateHTTPClient };
 declare const _default: {

package/lib/orm/http-orm-client.d.ts

@@ -1,6 +1,4 @@
-import { SDKRequestInterface } from '@cloudbase/adapter-interface';
-import { OrmClient, CallFunction } from '../types';
-type ModelFetch = NonNullable<SDKRequestInterface['fetch']>;
+import { OrmClient, CallFunction, ModelFetch } from '../types';
 export declare const enum EQUERY_PARAM_TYPE {
     ARRAY = "ARRAY",
     BOOLEAN = "BOOLEAN",
@@ -11,4 +9,3 @@ export declare const enum EQUERY_PARAM_TYPE {
 export declare const generateHTTPClient: (callFunction: CallFunction, fetch: ModelFetch, baseUrl: string, options?: {
     sqlBaseUrl?: string;
 }) => OrmClient;
-export {};

package/lib/types/index.d.ts

@@ -1,3 +1,4 @@
+import { SDKRequestInterface } from '@cloudbase/adapter-interface';
 /**
  * 基础 Model 类型定义
  */
@@ -289,7 +290,7 @@ export interface DataModelMethods<T> {
      * @param {Object} params - 包含模板名、模板参数、环境类型的参数对象。
      * @returns {Promise<MethodResponse<unknown>>} 包含记录列表和总数的Promise对象。
      */
-    runSQLTemplate?: (params: {
+    runSQLTemplate: (params: {
         /**
          * 模板名称
          */
@@ -725,4 +726,5 @@ export type CallFunction = (args: {
     name: string;
     data: Record<string, any>;
 }) => Promise<any>;
+export type ModelFetch = NonNullable<SDKRequestInterface['fetch']>;
 export {};

package/lib/wxCloudClientSDK.cjs.js

@@ -145,7 +145,7 @@ function getUserAgent() {
         return ua_1;
     }
 }
-var VERSION = "1.5.0";
+var VERSION = "1.6.0";
 
 var callDataSource = function (_a) {
     var dataSourceName = _a.dataSourceName, methodName = _a.methodName, params = _a.params, realMethodName = _a.realMethodName, callFunction = _a.callFunction, _b = _a.envType, envType = _b === void 0 ? 'prod' : _b, mode = _a.mode;
@@ -306,107 +306,6 @@ var createRawQueryClient = function (callFunction) { return ({
     }
 }); };
 
-var CRUD_METHODS = {
-    create: {
-        methodName: 'wedaCreateV2'
-    },
-    createMany: {
-        methodName: 'wedaBatchCreateV2'
-    },
-    update: {
-        methodName: 'wedaUpdateV2'
-    },
-    upsert: {
-        methodName: 'wedaUpsertV2'
-    },
-    updateMany: {
-        methodName: 'wedaBatchUpdateV2'
-    },
-    "delete": {
-        methodName: 'wedaDeleteV2'
-    },
-    deleteMany: {
-        methodName: 'wedaBatchDeleteV2'
-    },
-    get: {
-        methodName: 'wedaGetItemV2',
-        defaultParams: {
-            filter: {
-                where: {}
-            },
-            select: {
-                $master: true
-            }
-        }
-    },
-    list: {
-        methodName: 'wedaGetRecordsV2',
-        defaultParams: {
-            filter: {
-                where: {}
-            },
-            select: {
-                $master: true
-            }
-        }
-    }
-};
-var generateClientByDataSourceName = function (dataSourceName, callFunction) {
-    var client = new Proxy({}, {
-        get: function (target, methodName) {
-            var operation = CRUD_METHODS[methodName];
-            if (!operation) {
-                var error = new Error("\u4E0D\u652F\u6301\u7684\u64CD\u4F5C: ".concat(methodName));
-                throw new WxCloudSDKError(error.message || 'Unknown error occurred', {
-                    originError: error,
-                    code: 'NotSupported',
-                    requestId: 'N/A'
-                });
-            }
-            return function (params) { return __awaiter(void 0, void 0, void 0, function () {
-                var effectiveParams, rawData, result, dataKey;
-                var _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            effectiveParams = __assign(__assign({}, (operation.defaultParams || {})), (params || {}));
-                            return [4 /*yield*/, callDataSource({
-                                    callFunction: callFunction,
-                                    dataSourceName: dataSourceName,
-                                    methodName: operation.methodName,
-                                    realMethodName: methodName,
-                                    params: effectiveParams,
-                                    envType: params === null || params === void 0 ? void 0 : params.envType
-                                })];
-                        case 1:
-                            rawData = _b.sent();
-                            result = { data: {} };
-                            dataKey = operation.responseKey;
-                            result.data = dataKey ? (_a = rawData === null || rawData === void 0 ? void 0 : rawData.data) === null || _a === void 0 ? void 0 : _a[dataKey] : rawData === null || rawData === void 0 ? void 0 : rawData.data;
-                            return [2 /*return*/, result];
-                    }
-                });
-            }); };
-        }
-    });
-    return client;
-};
-// 使用 TypeScript 的 Proxy 来定义一个动态的客户端
-var generateClient = function (callFunction) {
-    var rawQueryClient = createRawQueryClient(callFunction);
-    return new Proxy({}, {
-        get: function (target, prop) {
-            if (typeof prop === 'string') {
-                if (Object.prototype.hasOwnProperty.call(rawQueryClient, prop)) {
-                    return rawQueryClient[prop];
-                }
-                // 返回一个函数，这个函数接受任意参数并返回一个 Promise
-                return generateClientByDataSourceName(prop, callFunction);
-            }
-        }
-    });
-};
-
 var READ_DEFAULT_PARAMS = {
     filter: {
         where: {}
@@ -591,17 +490,61 @@ var generateHTTPClientByDataSourceName = function (baseUrl, modelName, fetch, op
     return client;
 };
 
-function init(cloud) {
+function init(cloud, options) {
+    var _this = this;
     if (!cloud) {
         throw new Error('cloud is required');
     }
     if (!cloud.callFunction) {
         throw new Error('cloud.callFunction is required');
     }
-    var ormClientImpl = generateClient(cloud.callFunction.bind(cloud));
-    cloud.models = ormClientImpl;
+    var callFunction = cloud.callFunction.bind(cloud);
+    var HTTPOverCallFunctionFetch = function (_a) {
+        var url = _a.url, body = _a.body, method = _a.method, headers = _a.headers;
+        return __awaiter(_this, void 0, void 0, function () {
+            var res, result;
+            var _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0: return [4 /*yield*/, callFunction({
+                            name: 'httpOverCallFunction',
+                            data: {
+                                url: url,
+                                method: method === null || method === void 0 ? void 0 : method.toUpperCase(),
+                                headers: __assign(__assign({}, (headers || {})), { 'Content-Type': 'application/json' }),
+                                body: body
+                            }
+                        })];
+                    case 1:
+                        res = _c.sent();
+                        result = (_b = res === null || res === void 0 ? void 0 : res.result) === null || _b === void 0 ? void 0 : _b.body;
+                        return [2 /*return*/, result];
+                }
+            });
+        });
+    };
+    var baseUrl = (options === null || options === void 0 ? void 0 : options.baseUrl) || getDefaultGatewayBaseUrl(cloud).model;
+    var sqlBaseUrl = (options === null || options === void 0 ? void 0 : options.sqlBaseUrl) || getDefaultGatewayBaseUrl(cloud).sql;
+    var httpOrmClientImpl = generateHTTPClient(callFunction, HTTPOverCallFunctionFetch, baseUrl, {
+        sqlBaseUrl: sqlBaseUrl
+    });
+    cloud.models = httpOrmClientImpl;
     return cloud;
 }
+function getDefaultGatewayBaseUrl(cloud) {
+    var _a, _b, _c;
+    var env = (_b = (_a = cloud === null || cloud === void 0 ? void 0 : cloud.extend) === null || _a === void 0 ? void 0 : _a.AI) === null || _b === void 0 ? void 0 : _b.env;
+    if (typeof env !== 'string' || !env.trim())
+        env = (_c = cloud === null || cloud === void 0 ? void 0 : cloud.config) === null || _c === void 0 ? void 0 : _c.env;
+    if (typeof env !== 'string' || !env.trim()) {
+        throw new Error('Generating default gateway base url failed: env not found');
+    }
+    env = env.trim();
+    return {
+        model: "https://".concat(env, ".api.tcloudbasegateway.com/v1/model"),
+        sql: "https://".concat(env, ".api.tcloudbasegateway.com/v1/sql")
+    };
+}
 var index = {
     init: init,
     generateHTTPClient: generateHTTPClient

package/lib/wxCloudClientSDK.esm.js

@@ -141,7 +141,7 @@ function getUserAgent() {
         return ua_1;
     }
 }
-var VERSION = "1.5.0";
+var VERSION = "1.6.0";
 
 var callDataSource = function (_a) {
     var dataSourceName = _a.dataSourceName, methodName = _a.methodName, params = _a.params, realMethodName = _a.realMethodName, callFunction = _a.callFunction, _b = _a.envType, envType = _b === void 0 ? 'prod' : _b, mode = _a.mode;
@@ -302,107 +302,6 @@ var createRawQueryClient = function (callFunction) { return ({
     }
 }); };
 
-var CRUD_METHODS = {
-    create: {
-        methodName: 'wedaCreateV2'
-    },
-    createMany: {
-        methodName: 'wedaBatchCreateV2'
-    },
-    update: {
-        methodName: 'wedaUpdateV2'
-    },
-    upsert: {
-        methodName: 'wedaUpsertV2'
-    },
-    updateMany: {
-        methodName: 'wedaBatchUpdateV2'
-    },
-    "delete": {
-        methodName: 'wedaDeleteV2'
-    },
-    deleteMany: {
-        methodName: 'wedaBatchDeleteV2'
-    },
-    get: {
-        methodName: 'wedaGetItemV2',
-        defaultParams: {
-            filter: {
-                where: {}
-            },
-            select: {
-                $master: true
-            }
-        }
-    },
-    list: {
-        methodName: 'wedaGetRecordsV2',
-        defaultParams: {
-            filter: {
-                where: {}
-            },
-            select: {
-                $master: true
-            }
-        }
-    }
-};
-var generateClientByDataSourceName = function (dataSourceName, callFunction) {
-    var client = new Proxy({}, {
-        get: function (target, methodName) {
-            var operation = CRUD_METHODS[methodName];
-            if (!operation) {
-                var error = new Error("\u4E0D\u652F\u6301\u7684\u64CD\u4F5C: ".concat(methodName));
-                throw new WxCloudSDKError(error.message || 'Unknown error occurred', {
-                    originError: error,
-                    code: 'NotSupported',
-                    requestId: 'N/A'
-                });
-            }
-            return function (params) { return __awaiter(void 0, void 0, void 0, function () {
-                var effectiveParams, rawData, result, dataKey;
-                var _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            effectiveParams = __assign(__assign({}, (operation.defaultParams || {})), (params || {}));
-                            return [4 /*yield*/, callDataSource({
-                                    callFunction: callFunction,
-                                    dataSourceName: dataSourceName,
-                                    methodName: operation.methodName,
-                                    realMethodName: methodName,
-                                    params: effectiveParams,
-                                    envType: params === null || params === void 0 ? void 0 : params.envType
-                                })];
-                        case 1:
-                            rawData = _b.sent();
-                            result = { data: {} };
-                            dataKey = operation.responseKey;
-                            result.data = dataKey ? (_a = rawData === null || rawData === void 0 ? void 0 : rawData.data) === null || _a === void 0 ? void 0 : _a[dataKey] : rawData === null || rawData === void 0 ? void 0 : rawData.data;
-                            return [2 /*return*/, result];
-                    }
-                });
-            }); };
-        }
-    });
-    return client;
-};
-// 使用 TypeScript 的 Proxy 来定义一个动态的客户端
-var generateClient = function (callFunction) {
-    var rawQueryClient = createRawQueryClient(callFunction);
-    return new Proxy({}, {
-        get: function (target, prop) {
-            if (typeof prop === 'string') {
-                if (Object.prototype.hasOwnProperty.call(rawQueryClient, prop)) {
-                    return rawQueryClient[prop];
-                }
-                // 返回一个函数，这个函数接受任意参数并返回一个 Promise
-                return generateClientByDataSourceName(prop, callFunction);
-            }
-        }
-    });
-};
-
 var READ_DEFAULT_PARAMS = {
     filter: {
         where: {}
@@ -587,17 +486,61 @@ var generateHTTPClientByDataSourceName = function (baseUrl, modelName, fetch, op
     return client;
 };
 
-function init(cloud) {
+function init(cloud, options) {
+    var _this = this;
     if (!cloud) {
         throw new Error('cloud is required');
     }
     if (!cloud.callFunction) {
         throw new Error('cloud.callFunction is required');
     }
-    var ormClientImpl = generateClient(cloud.callFunction.bind(cloud));
-    cloud.models = ormClientImpl;
+    var callFunction = cloud.callFunction.bind(cloud);
+    var HTTPOverCallFunctionFetch = function (_a) {
+        var url = _a.url, body = _a.body, method = _a.method, headers = _a.headers;
+        return __awaiter(_this, void 0, void 0, function () {
+            var res, result;
+            var _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0: return [4 /*yield*/, callFunction({
+                            name: 'httpOverCallFunction',
+                            data: {
+                                url: url,
+                                method: method === null || method === void 0 ? void 0 : method.toUpperCase(),
+                                headers: __assign(__assign({}, (headers || {})), { 'Content-Type': 'application/json' }),
+                                body: body
+                            }
+                        })];
+                    case 1:
+                        res = _c.sent();
+                        result = (_b = res === null || res === void 0 ? void 0 : res.result) === null || _b === void 0 ? void 0 : _b.body;
+                        return [2 /*return*/, result];
+                }
+            });
+        });
+    };
+    var baseUrl = (options === null || options === void 0 ? void 0 : options.baseUrl) || getDefaultGatewayBaseUrl(cloud).model;
+    var sqlBaseUrl = (options === null || options === void 0 ? void 0 : options.sqlBaseUrl) || getDefaultGatewayBaseUrl(cloud).sql;
+    var httpOrmClientImpl = generateHTTPClient(callFunction, HTTPOverCallFunctionFetch, baseUrl, {
+        sqlBaseUrl: sqlBaseUrl
+    });
+    cloud.models = httpOrmClientImpl;
     return cloud;
 }
+function getDefaultGatewayBaseUrl(cloud) {
+    var _a, _b, _c;
+    var env = (_b = (_a = cloud === null || cloud === void 0 ? void 0 : cloud.extend) === null || _a === void 0 ? void 0 : _a.AI) === null || _b === void 0 ? void 0 : _b.env;
+    if (typeof env !== 'string' || !env.trim())
+        env = (_c = cloud === null || cloud === void 0 ? void 0 : cloud.config) === null || _c === void 0 ? void 0 : _c.env;
+    if (typeof env !== 'string' || !env.trim()) {
+        throw new Error('Generating default gateway base url failed: env not found');
+    }
+    env = env.trim();
+    return {
+        model: "https://".concat(env, ".api.tcloudbasegateway.com/v1/model"),
+        sql: "https://".concat(env, ".api.tcloudbasegateway.com/v1/sql")
+    };
+}
 var index = {
     init: init,
     generateHTTPClient: generateHTTPClient

package/lib/wxCloudClientSDK.umd.js

@@ -147,7 +147,7 @@
             return ua_1;
         }
     }
-    var VERSION = "1.5.0";
+    var VERSION = "1.6.0";
 
     var callDataSource = function (_a) {
         var dataSourceName = _a.dataSourceName, methodName = _a.methodName, params = _a.params, realMethodName = _a.realMethodName, callFunction = _a.callFunction, _b = _a.envType, envType = _b === void 0 ? 'prod' : _b, mode = _a.mode;
@@ -308,107 +308,6 @@
         }
     }); };
 
-    var CRUD_METHODS = {
-        create: {
-            methodName: 'wedaCreateV2'
-        },
-        createMany: {
-            methodName: 'wedaBatchCreateV2'
-        },
-        update: {
-            methodName: 'wedaUpdateV2'
-        },
-        upsert: {
-            methodName: 'wedaUpsertV2'
-        },
-        updateMany: {
-            methodName: 'wedaBatchUpdateV2'
-        },
-        "delete": {
-            methodName: 'wedaDeleteV2'
-        },
-        deleteMany: {
-            methodName: 'wedaBatchDeleteV2'
-        },
-        get: {
-            methodName: 'wedaGetItemV2',
-            defaultParams: {
-                filter: {
-                    where: {}
-                },
-                select: {
-                    $master: true
-                }
-            }
-        },
-        list: {
-            methodName: 'wedaGetRecordsV2',
-            defaultParams: {
-                filter: {
-                    where: {}
-                },
-                select: {
-                    $master: true
-                }
-            }
-        }
-    };
-    var generateClientByDataSourceName = function (dataSourceName, callFunction) {
-        var client = new Proxy({}, {
-            get: function (target, methodName) {
-                var operation = CRUD_METHODS[methodName];
-                if (!operation) {
-                    var error = new Error("\u4E0D\u652F\u6301\u7684\u64CD\u4F5C: ".concat(methodName));
-                    throw new WxCloudSDKError(error.message || 'Unknown error occurred', {
-                        originError: error,
-                        code: 'NotSupported',
-                        requestId: 'N/A'
-                    });
-                }
-                return function (params) { return __awaiter(void 0, void 0, void 0, function () {
-                    var effectiveParams, rawData, result, dataKey;
-                    var _a;
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
-                            case 0:
-                                effectiveParams = __assign(__assign({}, (operation.defaultParams || {})), (params || {}));
-                                return [4 /*yield*/, callDataSource({
-                                        callFunction: callFunction,
-                                        dataSourceName: dataSourceName,
-                                        methodName: operation.methodName,
-                                        realMethodName: methodName,
-                                        params: effectiveParams,
-                                        envType: params === null || params === void 0 ? void 0 : params.envType
-                                    })];
-                            case 1:
-                                rawData = _b.sent();
-                                result = { data: {} };
-                                dataKey = operation.responseKey;
-                                result.data = dataKey ? (_a = rawData === null || rawData === void 0 ? void 0 : rawData.data) === null || _a === void 0 ? void 0 : _a[dataKey] : rawData === null || rawData === void 0 ? void 0 : rawData.data;
-                                return [2 /*return*/, result];
-                        }
-                    });
-                }); };
-            }
-        });
-        return client;
-    };
-    // 使用 TypeScript 的 Proxy 来定义一个动态的客户端
-    var generateClient = function (callFunction) {
-        var rawQueryClient = createRawQueryClient(callFunction);
-        return new Proxy({}, {
-            get: function (target, prop) {
-                if (typeof prop === 'string') {
-                    if (Object.prototype.hasOwnProperty.call(rawQueryClient, prop)) {
-                        return rawQueryClient[prop];
-                    }
-                    // 返回一个函数，这个函数接受任意参数并返回一个 Promise
-                    return generateClientByDataSourceName(prop, callFunction);
-                }
-            }
-        });
-    };
-
     var READ_DEFAULT_PARAMS = {
         filter: {
             where: {}
@@ -593,17 +492,61 @@
         return client;
     };
 
-    function init(cloud) {
+    function init(cloud, options) {
+        var _this = this;
         if (!cloud) {
             throw new Error('cloud is required');
         }
         if (!cloud.callFunction) {
             throw new Error('cloud.callFunction is required');
         }
-        var ormClientImpl = generateClient(cloud.callFunction.bind(cloud));
-        cloud.models = ormClientImpl;
+        var callFunction = cloud.callFunction.bind(cloud);
+        var HTTPOverCallFunctionFetch = function (_a) {
+            var url = _a.url, body = _a.body, method = _a.method, headers = _a.headers;
+            return __awaiter(_this, void 0, void 0, function () {
+                var res, result;
+                var _b;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0: return [4 /*yield*/, callFunction({
+                                name: 'httpOverCallFunction',
+                                data: {
+                                    url: url,
+                                    method: method === null || method === void 0 ? void 0 : method.toUpperCase(),
+                                    headers: __assign(__assign({}, (headers || {})), { 'Content-Type': 'application/json' }),
+                                    body: body
+                                }
+                            })];
+                        case 1:
+                            res = _c.sent();
+                            result = (_b = res === null || res === void 0 ? void 0 : res.result) === null || _b === void 0 ? void 0 : _b.body;
+                            return [2 /*return*/, result];
+                    }
+                });
+            });
+        };
+        var baseUrl = (options === null || options === void 0 ? void 0 : options.baseUrl) || getDefaultGatewayBaseUrl(cloud).model;
+        var sqlBaseUrl = (options === null || options === void 0 ? void 0 : options.sqlBaseUrl) || getDefaultGatewayBaseUrl(cloud).sql;
+        var httpOrmClientImpl = generateHTTPClient(callFunction, HTTPOverCallFunctionFetch, baseUrl, {
+            sqlBaseUrl: sqlBaseUrl
+        });
+        cloud.models = httpOrmClientImpl;
         return cloud;
     }
+    function getDefaultGatewayBaseUrl(cloud) {
+        var _a, _b, _c;
+        var env = (_b = (_a = cloud === null || cloud === void 0 ? void 0 : cloud.extend) === null || _a === void 0 ? void 0 : _a.AI) === null || _b === void 0 ? void 0 : _b.env;
+        if (typeof env !== 'string' || !env.trim())
+            env = (_c = cloud === null || cloud === void 0 ? void 0 : cloud.config) === null || _c === void 0 ? void 0 : _c.env;
+        if (typeof env !== 'string' || !env.trim()) {
+            throw new Error('Generating default gateway base url failed: env not found');
+        }
+        env = env.trim();
+        return {
+            model: "https://".concat(env, ".api.tcloudbasegateway.com/v1/model"),
+            sql: "https://".concat(env, ".api.tcloudbasegateway.com/v1/sql")
+        };
+    }
     var index = {
         init: init,
         generateHTTPClient: generateHTTPClient

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/wx-cloud-client-sdk",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "publishConfig": {
     "access": "public"
   },
@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "@cloudbase/adapter-interface": "^0.5.0",
-    "@cloudbase/js-sdk": "2.8.15-beta.0",
+    "@cloudbase/js-sdk": "2.15.0",
     "@rollup/plugin-commonjs": "^25.0.8",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-replace": "^5.0.7",