@cloudbase/cli 2.6.0-alpha.6 → 2.6.0-alpha.8

package/lib/commands/fun/base.js

@@ -125,6 +125,10 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
                 {
                     flags: '--includeNodeModules',
                     desc: '包含本地 node_modules 目录，默认为 false 不包含'
+                },
+                {
+                    flags: '--functionsConfigFile <functionsConfigFile>',
+                    desc: '多函数定义配置文件，默认为 ./cloudbase-functions.json'
                 }
             ],
             requiredEnvId: false,
@@ -137,18 +141,45 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
             let { serviceName, appId, source, includeNodeModules = false } = options;
             const target = 'main';
             source = path_1.default.resolve(source || process.cwd());
-            const loadResult = yield (0, functions_framework_1.loadUserFunction)(source, target);
-            if (!(loadResult === null || loadResult === void 0 ? void 0 : loadResult.userFunction)) {
-                if (loadResult.reason.includes('is not a loadable module')) {
-                    log.error(`${source} 不是一个有效的函数式托管代码目录，可以通过 --source <source> 指定代码目录路径`);
+            const functionsConfigFile = options.functionsConfigFile || 'cloudbase-functions.json';
+            let multiFunctionsConfig = null;
+            if (functionsConfigFile && (yield fs_extra_1.default.exists(path_1.default.resolve(source, functionsConfigFile)))) {
+                try {
+                    debugger;
+                    multiFunctionsConfig = (0, functions_framework_1.loadFunctionsConfig)(functionsConfigFile);
                 }
-                else if (loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason.includes('is not defined in the provided module')) {
-                    log.error(`主文件并未导出目标函数 ${target}，请导出 ${target} 目标函数`);
+                catch (err) {
+                    log.error(`多函数定义配置文件 ${functionsConfigFile} 配置文件有误，请检查`);
+                    log.error(err);
+                    return;
                 }
-                else {
-                    log.error(loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason);
+            }
+            const loadResult = yield (0, functions_framework_1.loadFunctions)({
+                target,
+                sourceLocation: source,
+                multiFunctionsConfig
+            });
+            if (Array.isArray(loadResult)) {
+                for (const loadItem of loadResult) {
+                    if (!(loadItem === null || loadItem === void 0 ? void 0 : loadItem.userFunction)) {
+                        log.error(`加载函数 ${loadItem === null || loadItem === void 0 ? void 0 : loadItem.name} 失败: "${loadItem === null || loadItem === void 0 ? void 0 : loadItem.reason}"`);
+                        return;
+                    }
+                }
+            }
+            else {
+                if (!(loadResult === null || loadResult === void 0 ? void 0 : loadResult.userFunction)) {
+                    if (loadResult.reason.includes('is not a loadable module')) {
+                        log.error(`${source} 不是一个有效的函数式托管代码目录，可以通过 --source <source> 指定代码目录路径`);
+                    }
+                    else if (loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason.includes('is not defined in the provided module')) {
+                        log.error(`主文件并未导出目标函数 ${target}，请导出 ${target} 目标函数`);
+                    }
+                    else {
+                        log.error(loadResult === null || loadResult === void 0 ? void 0 : loadResult.reason);
+                    }
+                    return;
                 }
-                return;
             }
             if (!envId) {
                 envId = yield _selectEnv();
@@ -229,7 +260,7 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
                     envId,
                     serviceName,
                     filePath: source,
-                    fileToIgnore: includeNodeModules ? [] : ['node_modules', 'node_modules/**/*']
+                    fileToIgnore: ['logs', 'logs/**/*'].concat(includeNodeModules ? [] : ['node_modules', 'node_modules/**/*'])
                 });
                 packageName = PackageName;
                 packageVersion = PackageVersion;
@@ -309,6 +340,10 @@ let FunRunCommand = class FunRunCommand extends common_1.Command {
                 {
                     flags: '--logDirname <logDirname>',
                     desc: '日志文件目录，默认为 ./logs'
+                },
+                {
+                    flags: '--functionsConfigFile <functionsConfigFile>',
+                    desc: '多函数定义配置文件，默认为 ./cloudbase-functions.json'
                 }
             ],
             requiredEnvId: false,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.6.0-alpha.6",
+    "version": "2.6.0-alpha.8",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -33,7 +33,7 @@
     "dependencies": {
         "@cloudbase/cloud-api": "^0.5.5",
         "@cloudbase/framework-core": "^1.9.7",
-        "@cloudbase/functions-framework": "^1.0.0-beta.3",
+        "@cloudbase/functions-framework": "1.0.0-beta.11",
         "@cloudbase/lowcode-cli": "^0.21.1",
         "@cloudbase/manager-node": "4.2.8",
         "@cloudbase/toolbox": "^0.7.5",