edgeone 1.0.13 → 1.0.14-beta.2

package/edgeone-dist/cli.js

@@ -102539,7 +102539,7 @@ var yargs_default = Yargs;
 // package.json
 var package_default = {
   name: "edgeone",
-  version: "1.0.13",
+  version: "1.0.14-beta.1",
   description: "Command-line interface for TencentCloud Pages Functions",
   bin: {
     edgeone: "./edgeone-bin/edgeone.js"
@@ -113116,7 +113116,7 @@ var esbuild = require("esbuild");
 var FUNCTIONPATH = "./functions";
 var OUTPUTPATH = "./.edgeone/functions/index.js";
 var OUTPUTMETA = "./.edgeone/meta.json";
-var regex1 = /^\/(?:[^/]+\/)*\[(.+?)\]$/;
+var regex1 = /^\/(?:[^/]+\/)*\[(.+?)\]/;
 var regex2 = /^\/(?:[^/]+\/)*\[\[(.+?)\]\]$/;
 var methodList = [
   // {
@@ -113231,13 +113231,21 @@ var BuildFunctionGenerator = class {
 
         const params = {};
         if (routeParams.id) {
-          const value = urlInfo.pathname.replace(routeParams.left, '');
-          const splitedValue = value.split('/');
-          if (splitedValue.length === 1) {
-            params[routeParams.id] = splitedValue[0];
+          if (routeParams.mode === 1) {
+            const value = urlInfo.pathname.match(routeParams.left);        
+            for (let i = 1; i < value.length; i++) {
+              params[routeParams.id[i - 1]] = value[i];
+            }
           } else {
-            params[routeParams.id] = splitedValue;
+            const value = urlInfo.pathname.replace(routeParams.left, '');
+            const splitedValue = value.split('/');
+            if (splitedValue.length === 1) {
+              params[routeParams.id] = splitedValue[0];
+            } else {
+              params[routeParams.id] = splitedValue;
+            }
           }
+          
         }
         if(!matchedFunc){
           pagesFunctionResponse = function() {
@@ -113308,7 +113316,6 @@ var BuildFunctionGenerator = class {
     return false;
   }
   matchPath(path9) {
-    const regex12 = /^\/(?:[^/]+\/)*\[(.+?)\]$/;
     const regex22 = /^\/(?:[^/]+\/)*\[\[(.+?)\]\]$/;
     if (regex22.test(path9) && path9.indexOf("[[") > -1) {
       const match = regex22.exec(path9);
@@ -113319,13 +113326,21 @@ var BuildFunctionGenerator = class {
           left: path9.replace(`[[${match[1]}]]`, "")
         };
       }
-    } else if (regex12.test(path9)) {
-      const match = regex12.exec(path9);
+    } else if (regex1.test(path9)) {
+      const match = regex1.exec(path9);
+      const regex = /\[(.*?)\]/g;
+      const matches = path9.match(regex);
+      const parameters = matches.map((match2) => match2.slice(1, -1));
+      let leftPart = JSON.parse(JSON.stringify(path9));
+      parameters == null ? void 0 : parameters.forEach((item) => {
+        leftPart = leftPart.replace(`[${item}]`, `([^/]*)`);
+      });
+      leftPart = leftPart.replace(/\//g, "\\/");
       if (match[1]) {
         return {
-          id: match[1],
+          id: parameters,
           mode: 1,
-          left: path9.replace(`[${match[1]}]`, "")
+          left: leftPart
         };
       }
     } else {
@@ -113353,10 +113368,8 @@ var BuildFunctionGenerator = class {
         `;
         this.recordFunc(stringMap, "onRequest");
       } else if (routeParams.mode === 1) {
-        const match = regex1.exec(`${stringMap.path}`);
-        const leftPart = `${stringMap.path}`.replace(`[${match[1]}]`, "").replace(/\//g, "\\/");
         this.logicText += `
-          if(/^${leftPart}([^/]+)$/.test(urlInfo.pathname)) {
+          if(/^${routeParams.left}$/.test(urlInfo.pathname)) {
             routeParams = ${JSON.stringify(routeParams)};
             matchedFunc = true;
               ${tempResult}
@@ -113391,10 +113404,8 @@ var BuildFunctionGenerator = class {
           `;
           this.recordFunc(stringMap, item.funcName);
         } else if (routeParams.mode === 1) {
-          const match = regex1.exec(`${stringMap.path}`);
-          const leftPart = `${stringMap.path}`.replace(`[${match[1]}]`, "").replace(/\//g, "\\/");
           this.logicText += `
-            if(/^${leftPart}([^/]+)$/.test(urlInfo.pathname) && request.method === '${item.method}') {
+            if(/^${routeParams.left}$/.test(urlInfo.pathname)) {
               routeParams = ${JSON.stringify(routeParams)};
               matchedFunc = true;
                 ${tempResult}
@@ -113403,7 +113414,7 @@ var BuildFunctionGenerator = class {
           this.recordFunc(stringMap, item.funcName);
         } else if (routeParams.mode === 2) {
           const match = regex2.exec(`${stringMap.path}`);
-          const leftPart = `${stringMap.path}`.replace(`[${match[1]}]`, "").replace(/\//g, "\\/");
+          const leftPart = `${stringMap.path}`.replace(`[[${match[1]}]]`, "").replace(/\//g, "\\/");
           this.logicText += `
             if(/^${leftPart}(.+?)$/.test(urlInfo.pathname) && request.method === '${item.method}') {
               routeParams = ${JSON.stringify(routeParams)};
@@ -113418,7 +113429,7 @@ var BuildFunctionGenerator = class {
     this.functionIndex = this.functionIndex + 1;
   }
   getMountPath(fullPath) {
-    const p = fullPath.replace(/\/([^/]+)$/, "");
+    const p = fullPath.replace(/\/([^/]+)$/g, "");
     if (!p) {
       return "/";
     }
@@ -113426,7 +113437,7 @@ var BuildFunctionGenerator = class {
   }
   recordFunc(obj, method) {
     try {
-      const key2 = obj.path.replace("functions/", "").replace(/\/\[\[(.+)\]\]$/, "/:$1").replace(/\/\[(.+)\]$/, "/:$1");
+      const key2 = obj.path.replace("functions/", "").replace(/\/\[\[([^/]+)\]\]$/, "/:$1*").replace(/\/\[([^/]+)\]/g, "/:$1");
       this.functionList.push({
         routePath: key2,
         mountPath: this.getMountPath(key2),
@@ -113441,6 +113452,10 @@ var BuildFunctionGenerator = class {
     }
   }
   bundleAndGetString(filePath) {
+    const define2 = {};
+    for (const k in this.env) {
+      define2[`env.${k}`] = JSON.stringify(process.env[k]);
+    }
     const result = esbuild.buildSync({
       entryPoints: [filePath],
       bundle: true,
@@ -113449,7 +113464,9 @@ var BuildFunctionGenerator = class {
       // outdir: './.tef_dist/assets',
       write: false,
       // 禁止写入文件
-      outfile: "./.tef_dist/assets.js"
+      outfile: "./.tef_dist/assets.js",
+      // envs
+      define: define2
     });
     const { outputFiles } = result;
     let currentFileInfo;
@@ -113801,10 +113818,10 @@ function _supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
     return 1;
   }
   if ("CI" in env2) {
-    if (["GITHUB_ACTIONS", "GITEA_ACTIONS", "CIRCLECI"].some((key2) => key2 in env2)) {
+    if ("GITHUB_ACTIONS" in env2 || "GITEA_ACTIONS" in env2) {
       return 3;
     }
-    if (["TRAVIS", "APPVEYOR", "GITLAB_CI", "BUILDKITE", "DRONE"].some((sign) => sign in env2) || env2.CI_NAME === "codeship") {
+    if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI", "BUILDKITE", "DRONE"].some((sign) => sign in env2) || env2.CI_NAME === "codeship") {
       return 1;
     }
     return min;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edgeone",
-  "version": "1.0.13",
+  "version": "1.0.14-beta.2",
   "description": "Command-line interface for TencentCloud Pages Functions",
   "bin": {
     "edgeone": "./edgeone-bin/edgeone.js"