fix(sdk): unable to use path variables in cloud.Api (#3931)

Fixes #3919

## Checklist

- [x] Title matches [Winglang's style guide](https://www.winglang.io/contributing/start-here/pull_requests#how-are-pull-request-titles-formatted)
- [ ] Description explains motivation and solution
- [x] Tests added (always)
- [ ] Docs updated (only required for features)
- [ ] Added `pr/e2e-full` label if this feature requires end-to-end testing

*By submitting this pull request, I confirm that my contribution is made under the terms of the [Wing Cloud Contribution License](https://github.com/winglang/wing/blob/main/CONTRIBUTION_LICENSE.md)*.

examples/tests/sdk_tests/api/path_vars.w

@@ -0,0 +1,64 @@
+bring cloud;
+bring http;
+
+let api = new cloud.Api();
+
+
+let handler = inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
+  return cloud.ApiResponse {
+    body: Json.stringify({ user: req.vars.get("name") }),
+    headers: { "content-type" => "application/json" },
+    status: 200
+  };
+};
+
+let handler_two = inflight (req: cloud.ApiRequest): cloud.ApiResponse => {
+  return cloud.ApiResponse {
+    body: Json.stringify({ user: req.vars.get("name"), age: req.vars.get("age") }),
+    headers: { "content-type" => "application/json" },
+    status: 200
+  };
+};
+
+api.get("/users/{name}", handler);
+api.get("/{name}", handler);
+api.get("/users/permission/{name}", handler);
+api.get("/{name}/{age}", handler_two);
+
+test "test" {
+  let username = "tsuf";
+  let res: http.Response = http.get("${api.url}/users/${username}");
+
+
+  assert(res.status == 200);
+  assert(Json.parse(res.body ?? "").get("user") == username);
+}
+
+test "test2" {
+  let username = "akhil";
+  let res: http.Response = http.get("${api.url}/${username}");
+
+
+  assert(res.status == 200);
+  assert(Json.parse(res.body ?? "").get("user") == username);
+}
+
+test "test3" {
+  let username = "akhil";
+  let res: http.Response = http.get("${api.url}/users/permission/${username}");
+
+
+  assert(res.status == 200);
+  assert(Json.parse(res.body ?? "").get("user") == username);
+}
+
+test "test4" {
+  let username = "akhil";
+  let age = "23";
+  let res: http.Response = http.get("${api.url}/${username}/${age}");
+
+
+  assert(res.status == 200);
+  assert(Json.parse(res.body ?? "").get("user") == username);
+  assert(Json.parse(res.body ?? "").get("age") == age);
+}

examples/tests/valid/api_valid_path.w

@@ -40,11 +40,27 @@ testInvalidPath("/test/path/{unclosed");
 testInvalidPath("/test/m{issplaced}");
 testInvalidPath("/test/{misspla}ced");
 testInvalidPath("/test/{}/empty");
-
+testInvalidPath("/{sup:er/:annoying//path}");
+testInvalidPath("/{::another:annoying:path}");
+testInvalidPath("/n0t_alphanumer1cPa:th");
+testInvalidPath("/{with}/{two:invali4d#}/variables");
+testInvalidPath("/{unclosed");
+testInvalidPath("/m{issplaced}");
+testInvalidPath("/{misspla}ced");
+testInvalidPath("test");
+testInvalidPath("/{}/empty");
+testInvalidPath("/{}");
+
 
 // valid paths
 testValidPath("/test");
 testValidPath("/test/alphanumer1cPa_th");
 testValidPath("/test/regular/path");
 testValidPath("/test/pa-th/{with}/two/{variable_s}/f?bla=5&b=6");
 testValidPath("/test/param/is/{last}");
+testValidPath("/test/{param}");
+testValidPath("/{param}");
+testValidPath("/t/{param}");
+testValidPath("/test/regular/path/{param}");
+testValidPath("/test/segment1/{param1}/segment2?query1=value1?query2=value2");
+testValidPath("/test/segment1/segment2?query=value1&query2=value2");

libs/wingsdk/src/cloud/api.ts

@@ -172,7 +172,11 @@ export abstract class Api extends Resource {
    * @internal
    */
   protected _validatePath(path: string) {
-    if (!/^([^\{\}\:\n]|.+\/\{\w+\}(\/|$))*$/g.test(path)) {
+    if (
+      !/^(\/[a-zA-Z0-9_\-]+(\/\{[a-zA-Z0-9_\-]+\}|\/[a-zA-Z0-9_\-]+)*(?:\?[^#]*)?)?$|^(\/\{[a-zA-Z0-9_\-]+\})*\/?$/g.test(
+        path
+      )
+    ) {
       throw new Error(
         `Invalid path ${path}. Url cannot contain ":", params contains only alpha-numeric chars or "_".`
       );