Fully support url template in Modular

packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/api/multivariate/index.ts

@@ -31,6 +31,7 @@ import {
   PagedAsyncIterableIterator,
   buildPagedAsyncIterator,
 } from "../../static-helpers/pagingHelpers.js";
+import { parseTemplate } from "../../static-helpers/uriTemplate.js";
 import {
   StreamableMethod,
   PathUncheckedResponse,
@@ -45,8 +46,11 @@ export function _getMultivariateBatchDetectionResultSend(
     requestOptions: {},
   },
 ): StreamableMethod {
+  const path = parseTemplate("/multivariate/detect-batch/{resultId}").expand({
+    resultId: resultId,
+  });
   return context
-    .path("/multivariate/detect-batch/{resultId}", resultId)
+    .path(path)
     .get({ ...operationOptionsToRequestParameters(options) });
 }
 
@@ -132,12 +136,13 @@ export function _listMultivariateModelsSend(
     requestOptions: {},
   },
 ): StreamableMethod {
+  const path = parseTemplate("/multivariate/models{?skip,top}").expand({
+    skip: options?.skip,
+    top: options?.top,
+  });
   return context
-    .path("/multivariate/models")
-    .get({
-      ...operationOptionsToRequestParameters(options),
-      queryParameters: { skip: options?.skip, top: options?.top },
-    });
+    .path(path)
+    .get({ ...operationOptionsToRequestParameters(options) });
 }
 
 export async function _listMultivariateModelsDeserialize(
@@ -174,8 +179,11 @@ export function _deleteMultivariateModelSend(
     requestOptions: {},
   },
 ): StreamableMethod {
+  const path = parseTemplate("/multivariate/models/{modelId}").expand({
+    modelId: modelId,
+  });
   return context
-    .path("/multivariate/models/{modelId}", modelId)
+    .path(path)
     .delete({ ...operationOptionsToRequestParameters(options) });
 }
 
@@ -209,8 +217,11 @@ export function _getMultivariateModelSend(
     requestOptions: {},
   },
 ): StreamableMethod {
+  const path = parseTemplate("/multivariate/models/{modelId}").expand({
+    modelId: modelId,
+  });
   return context
-    .path("/multivariate/models/{modelId}", modelId)
+    .path(path)
     .get({ ...operationOptionsToRequestParameters(options) });
 }
 
@@ -248,8 +259,13 @@ export function _detectMultivariateBatchAnomalySend(
     requestOptions: {},
   },
 ): StreamableMethod {
+  const path = parseTemplate(
+    "/multivariate/models/{modelId}:detect-batch",
+  ).expand({
+    modelId: modelId,
+  });
   return context
-    .path("/multivariate/models/{modelId}:detect-batch", modelId)
+    .path(path)
     .post({
       ...operationOptionsToRequestParameters(optionalParams),
       body: multivariateMultivariateBatchDetectionOptionsSerializer(options),
@@ -300,8 +316,13 @@ export function _detectMultivariateLastAnomalySend(
     requestOptions: {},
   },
 ): StreamableMethod {
+  const path = parseTemplate(
+    "/multivariate/models/{modelId}:detect-last",
+  ).expand({
+    modelId: modelId,
+  });
   return context
-    .path("/multivariate/models/{modelId}:detect-last", modelId)
+    .path(path)
     .post({
       ...operationOptionsToRequestParameters(optionalParams),
       body: multivariateMultivariateLastDetectionOptionsSerializer(options),

packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/static-helpers/uriTemplate.ts

@@ -0,0 +1,172 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+function encodeReserved(str: any) {
+  return str
+    .split(/(%[0-9A-Fa-f]{2})/g)
+    .map(function (part: any) {
+      if (!/%[0-9A-Fa-f]/.test(part)) {
+        part = encodeURI(part).replace(/%5B/g, "[").replace(/%5D/g, "]");
+      }
+      return part;
+    })
+    .join("");
+}
+
+function encodeUnreserved(str: any) {
+  return encodeURIComponent(str).replace(/[!'()*]/g, function (c) {
+    return "%" + c.charCodeAt(0).toString(16).toUpperCase();
+  });
+}
+
+function encodeValue(operator: any, value: any, key?: any | null) {
+  value =
+    operator === "+" || operator === "#"
+      ? encodeReserved(value)
+      : encodeUnreserved(value);
+
+  if (key) {
+    return encodeUnreserved(key) + "=" + value;
+  } else {
+    return value;
+  }
+}
+
+function isDefined(value: any) {
+  return value !== undefined && value !== null;
+}
+
+function isKeyOperator(operator: string): boolean {
+  return operator === ";" || operator === "&" || operator === "?";
+}
+
+function getValues(
+  context: any,
+  operator: any,
+  key: any | null,
+  modifier: any | null,
+) {
+  var value = context[key],
+    result: any[] = [];
+
+  if (isDefined(value) && value !== "") {
+    if (
+      typeof value === "string" ||
+      typeof value === "number" ||
+      typeof value === "boolean"
+    ) {
+      value = value.toString();
+
+      if (modifier && modifier !== "*") {
+        value = value.substring(0, parseInt(modifier, 10));
+      }
+      result.push(
+        encodeValue(operator, value, isKeyOperator(operator) ? key : null),
+      );
+    } else {
+      if (modifier === "*") {
+        if (Array.isArray(value)) {
+          value.filter(isDefined).forEach(function (value) {
+            result.push(
+              encodeValue(
+                operator,
+                value,
+                isKeyOperator(operator) ? key : null,
+              ),
+            );
+          });
+        } else {
+          Object.keys(value).forEach(function (k) {
+            if (isDefined(value[k])) {
+              result.push(encodeValue(operator, value[k], k));
+            }
+          });
+        }
+      } else {
+        var tmp: any[] = [];
+
+        if (Array.isArray(value)) {
+          value.filter(isDefined).forEach(function (value) {
+            tmp.push(encodeValue(operator, value));
+          });
+        } else {
+          Object.keys(value).forEach(function (k) {
+            if (isDefined(value[k])) {
+              tmp.push(encodeUnreserved(k));
+              tmp.push(encodeValue(operator, value[k].toString()));
+            }
+          });
+        }
+
+        if (isKeyOperator(operator)) {
+          result.push(encodeUnreserved(key) + "=" + tmp.join(","));
+        } else if (tmp.length !== 0) {
+          result.push(tmp.join(","));
+        }
+      }
+    }
+  } else {
+    if (operator === ";") {
+      if (isDefined(value)) {
+        result.push(encodeUnreserved(key));
+      }
+    } else if (value === "" && (operator === "&" || operator === "?")) {
+      result.push(encodeUnreserved(key) + "=");
+    } else if (value === "") {
+      result.push("");
+    }
+  }
+  return result;
+}
+
+export function parseTemplate(template: any) {
+  var operators = ["+", "#", ".", "/", ";", "?", "&"];
+
+  return {
+    expand: function (context: any) {
+      return template.replace(
+        /\{([^\{\}]+)\}|([^\{\}]+)/g,
+        function (_: any, expression: any, literal: any) {
+          if (expression) {
+            var operator: any = null,
+              values: any[] = [];
+
+            if (operators.indexOf(expression.charAt(0)) !== -1) {
+              operator = expression.charAt(0);
+              expression = expression.substr(1);
+            }
+
+            expression.split(/,/g).forEach(function (variable: any) {
+              var tmp = /([^:\*]*)(?::(\d+)|(\*))?/.exec(variable);
+              if (!!tmp) {
+                values.push.apply(
+                  values,
+                  getValues(context, operator, tmp[1], tmp[2] || tmp[3]),
+                );
+              }
+            });
+
+            if (operator && operator !== "+") {
+              var separator = ",";
+
+              if (operator === "?") {
+                separator = "&";
+              } else if (operator !== "#") {
+                separator = operator;
+              }
+              return (
+                (values.length !== 0 ? operator : "") + values.join(separator)
+              );
+            } else {
+              return values.join(",");
+            }
+          } else {
+            return encodeReserved(literal);
+          }
+        },
+      );
+    },
+  };
+}