@vercel/redwood 2.3.2 → 2.3.4

package/dist/index.js

@@ -1049,14 +1049,26 @@ var require_superstatic = __commonJS({
       }
       return hasItems;
     };
+    function getStringValueForRegex(value) {
+      if (typeof value === "string") {
+        return value;
+      }
+      if (value && typeof value === "object" && value !== null) {
+        if ("re" in value && typeof value.re === "string") {
+          return value.re;
+        }
+      }
+      return null;
+    }
     function collectHasSegments(has) {
       const hasSegments = /* @__PURE__ */ new Set();
       for (const hasItem of has || []) {
         if (!hasItem.value && "key" in hasItem) {
           hasSegments.add(hasItem.key);
         }
-        if (hasItem.value) {
-          for (const match of hasItem.value.matchAll(namedGroupsRegex)) {
+        const stringValue = getStringValueForRegex(hasItem.value);
+        if (stringValue) {
+          for (const match of stringValue.matchAll(namedGroupsRegex)) {
             if (match[1]) {
               hasSegments.add(match[1]);
             }
@@ -1404,6 +1416,101 @@ var require_schemas = __commonJS({
       trailingSlashSchema: () => trailingSlashSchema
     });
     module2.exports = __toCommonJS2(schemas_exports);
+    var mitigateSchema = {
+      description: "Mitigation action to take on a route",
+      type: "object",
+      additionalProperties: false,
+      required: ["action"],
+      properties: {
+        action: {
+          description: "The mitigation action to take",
+          type: "string",
+          enum: ["challenge", "deny"]
+        }
+      }
+    };
+    var matchableValueSchema = {
+      description: "A value to match against. Can be a string (regex) or a condition operation object",
+      anyOf: [
+        {
+          description: "A regular expression used to match thev value. Named groups can be used in the destination.",
+          type: "string",
+          maxLength: 4096
+        },
+        {
+          description: "A condition operation object",
+          type: "object",
+          additionalProperties: false,
+          minProperties: 1,
+          properties: {
+            eq: {
+              description: "Equal to",
+              anyOf: [
+                {
+                  type: "string",
+                  maxLength: 4096
+                },
+                {
+                  type: "number"
+                }
+              ]
+            },
+            neq: {
+              description: "Not equal",
+              type: "string",
+              maxLength: 4096
+            },
+            inc: {
+              description: "In array",
+              type: "array",
+              items: {
+                type: "string",
+                maxLength: 4096
+              }
+            },
+            ninc: {
+              description: "Not in array",
+              type: "array",
+              items: {
+                type: "string",
+                maxLength: 4096
+              }
+            },
+            pre: {
+              description: "Starts with",
+              type: "string",
+              maxLength: 4096
+            },
+            suf: {
+              description: "Ends with",
+              type: "string",
+              maxLength: 4096
+            },
+            re: {
+              description: "Regex",
+              type: "string",
+              maxLength: 4096
+            },
+            gt: {
+              description: "Greater than",
+              type: "number"
+            },
+            gte: {
+              description: "Greater than or equal to",
+              type: "number"
+            },
+            lt: {
+              description: "Less than",
+              type: "number"
+            },
+            lte: {
+              description: "Less than or equal to",
+              type: "number"
+            }
+          }
+        }
+      ]
+    };
     var hasSchema = {
       description: "An array of requirements that are needed to match",
       type: "array",
@@ -1420,11 +1527,7 @@ var require_schemas = __commonJS({
                 type: "string",
                 enum: ["host"]
               },
-              value: {
-                description: "A regular expression used to match the value. Named groups can be used in the destination",
-                type: "string",
-                maxLength: 4096
-              }
+              value: matchableValueSchema
             }
           },
           {
@@ -1442,10 +1545,195 @@ var require_schemas = __commonJS({
                 type: "string",
                 maxLength: 4096
               },
-              value: {
-                description: "A regular expression used to match the value. Named groups can be used in the destination",
+              value: matchableValueSchema
+            }
+          }
+        ]
+      }
+    };
+    var transformsSchema = {
+      description: "A list of transform rules to adjust the query parameters of a request or HTTP headers of request or response",
+      type: "array",
+      minItems: 1,
+      items: {
+        type: "object",
+        additionalProperties: false,
+        required: ["type", "op", "target"],
+        properties: {
+          type: {
+            description: "The scope of the transform to apply",
+            type: "string",
+            enum: ["request.headers", "request.query", "response.headers"]
+          },
+          op: {
+            description: "The operation to perform on the target",
+            type: "string",
+            enum: ["append", "set", "delete"]
+          },
+          target: {
+            description: "The target of the transform",
+            type: "object",
+            required: ["key"],
+            properties: {
+              // re is not supported for transforms. Once supported, replace target.key with matchableValueSchema
+              key: {
+                description: "A value to match against. Can be a string or a condition operation object (without regex support)",
+                anyOf: [
+                  {
+                    description: "A valid header name (letters, numbers, hyphens, underscores)",
+                    type: "string",
+                    maxLength: 4096
+                  },
+                  {
+                    description: "A condition operation object",
+                    type: "object",
+                    additionalProperties: false,
+                    minProperties: 1,
+                    properties: {
+                      eq: {
+                        description: "Equal to",
+                        anyOf: [
+                          {
+                            type: "string",
+                            maxLength: 4096
+                          },
+                          {
+                            type: "number"
+                          }
+                        ]
+                      },
+                      neq: {
+                        description: "Not equal",
+                        type: "string",
+                        maxLength: 4096
+                      },
+                      inc: {
+                        description: "In array",
+                        type: "array",
+                        items: {
+                          type: "string",
+                          maxLength: 4096
+                        }
+                      },
+                      ninc: {
+                        description: "Not in array",
+                        type: "array",
+                        items: {
+                          type: "string",
+                          maxLength: 4096
+                        }
+                      },
+                      pre: {
+                        description: "Starts with",
+                        type: "string",
+                        maxLength: 4096
+                      },
+                      suf: {
+                        description: "Ends with",
+                        type: "string",
+                        maxLength: 4096
+                      },
+                      gt: {
+                        description: "Greater than",
+                        type: "number"
+                      },
+                      gte: {
+                        description: "Greater than or equal to",
+                        type: "number"
+                      },
+                      lt: {
+                        description: "Less than",
+                        type: "number"
+                      },
+                      lte: {
+                        description: "Less than or equal to",
+                        type: "number"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          },
+          args: {
+            description: "The arguments to the operation",
+            anyOf: [
+              {
                 type: "string",
                 maxLength: 4096
+              },
+              {
+                type: "array",
+                minItems: 1,
+                items: {
+                  type: "string",
+                  maxLength: 4096
+                }
+              }
+            ]
+          }
+        },
+        allOf: [
+          {
+            if: {
+              properties: {
+                op: {
+                  enum: ["append", "set"]
+                }
+              }
+            },
+            then: {
+              required: ["args"]
+            }
+          },
+          {
+            if: {
+              allOf: [
+                {
+                  properties: {
+                    type: {
+                      enum: ["request.headers", "response.headers"]
+                    }
+                  }
+                },
+                {
+                  properties: {
+                    op: {
+                      enum: ["set", "append"]
+                    }
+                  }
+                }
+              ]
+            },
+            then: {
+              properties: {
+                target: {
+                  properties: {
+                    key: {
+                      if: {
+                        type: "string"
+                      },
+                      then: {
+                        pattern: "^[a-zA-Z0-9_-]+$"
+                      }
+                    }
+                  }
+                },
+                args: {
+                  anyOf: [
+                    {
+                      type: "string",
+                      pattern: "^[a-zA-Z0-9_ :;.,\"'?!(){}\\[\\]@<>=+*#$&`|~\\^%/-]+$"
+                    },
+                    {
+                      type: "array",
+                      items: {
+                        type: "string",
+                        pattern: "^[a-zA-Z0-9_ :;.,\"'?!(){}\\[\\]@<>=+*#$&`|~\\^%/-]+$"
+                      }
+                    }
+                  ]
+                }
               }
             }
           }
@@ -1454,7 +1742,6 @@ var require_schemas = __commonJS({
     };
     var routesSchema = {
       type: "array",
-      maxItems: 2048,
       deprecated: true,
       description: "A list of routes objects used to rewrite paths to point towards other internal or external paths",
       example: [{ dest: "https://docs.example.com", src: "/docs" }],
@@ -1563,7 +1850,9 @@ var require_schemas = __commonJS({
                 }
               },
               has: hasSchema,
-              missing: hasSchema
+              missing: hasSchema,
+              mitigate: mitigateSchema,
+              transforms: transformsSchema
             }
           },
           {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/redwood",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@vercel/nft": "0.29.2",
-    "@vercel/static-config": "3.1.0",
+    "@vercel/static-config": "3.1.1",
     "semver": "6.3.1",
     "ts-morph": "12.0.0"
   },
@@ -22,8 +22,8 @@
     "@types/aws-lambda": "8.10.19",
     "@types/node": "14.18.33",
     "@types/semver": "6.0.0",
-    "@vercel/build-utils": "10.6.0",
-    "@vercel/routing-utils": "5.0.4",
+    "@vercel/build-utils": "10.6.7",
+    "@vercel/routing-utils": "5.1.1",
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
     "jest-junit": "16.0.0"