@azure-tools/rlc-common 1.0.0-beta.1 → 1.0.0-beta.10

package/src/buildResponseTypes.ts

@@ -20,10 +20,12 @@ import {
   getResponseTypeName
 } from "./helpers/nameConstructors.js";
 
+let hasErrorResponse = false;
 export function buildResponseTypes(model: RLCModel) {
   const project = new Project();
   const srcPath = model.srcPath;
   const filePath = path.join(srcPath, `responses.ts`);
+  hasErrorResponse = false;
   const responsesFile = project.createSourceFile(filePath, undefined, {
     overwrite: true
   });
@@ -86,19 +88,26 @@ export function buildResponseTypes(model: RLCModel) {
       }
     ]);
   }
+  const namedImports = ["HttpResponse"];
+  if (hasErrorResponse) {
+    namedImports.push("ErrorResponse");
+  }
   responsesFile.addImportDeclarations([
     {
-      namedImports: ["HttpResponse"],
+      namedImports,
       moduleSpecifier: "@azure-rest/core-client"
     }
   ]);
 
   if (model.importSet?.has(ImportKind.ResponseOutput)) {
+    const modelNamedImports = Array.from(
+      model.importSet.get(ImportKind.ResponseOutput) || []
+    ).filter((modelName) => {
+      return !(modelName === "ErrorResponseOutput" && hasErrorResponse);
+    });
     responsesFile.addImportDeclarations([
       {
-        namedImports: [
-          ...Array.from(model.importSet.get(ImportKind.ResponseOutput) || [])
-        ],
+        namedImports: modelNamedImports,
         moduleSpecifier: "./outputModels"
       }
     ]);
@@ -125,7 +134,7 @@ function getResponseHeaderInterfaceDefinition(
         name: h.name,
         ...(description && { docs: [{ description }] }),
         type: h.type,
-        hasQuestionToken: !Boolean(h.required)
+        hasQuestionToken: !h.required
       };
     })
   };
@@ -149,9 +158,17 @@ function getResponseInterfaceProperties(
 
   if (response.body) {
     const description = response.body.description;
+    let type = response.body.type;
+    if (
+      response.body.type === "ErrorResponseOutput" &&
+      response.body.fromCore
+    ) {
+      type = "ErrorResponse";
+      hasErrorResponse = true;
+    }
     responseProperties.push({
       name: "body",
-      type: response.body.type,
+      type,
       kind: StructureKind.PropertySignature,
       ...(description && { docs: [{ description }] })
     });

package/src/buildSchemaType.ts

@@ -4,6 +4,7 @@
 import { Project } from "ts-morph";
 import * as path from "path";
 import {
+  buildObjectAliases,
   buildObjectInterfaces,
   buildPolymorphicAliases
 } from "./buildObjectTypes.js";
@@ -41,15 +42,37 @@ export function generateModelFiles(
     importedModels,
     schemaContext
   );
+
   const objectTypeAliases = buildPolymorphicAliases(model, schemaContext);
 
-  if (objectTypeAliases.length || objectsDefinitions.length) {
+  const objectAliases = buildObjectAliases(model, importedModels, schemaContext);
+  if (objectTypeAliases.length || objectsDefinitions.length || objectAliases.length) {
     const modelsFile = project.createSourceFile(filePath, undefined, {
       overwrite: true
     });
 
     modelsFile.addInterfaces(objectsDefinitions);
     modelsFile.addTypeAliases(objectTypeAliases);
+    modelsFile.addTypeAliases(objectAliases);
+    if (importedModels.has("Paged")) {
+      modelsFile.addImportDeclarations([
+        {
+          namedImports: ["Paged"],
+          moduleSpecifier: "@azure/core-paging"
+        }
+      ]);
+      importedModels.delete("Paged");
+    }
+    if (importedModels.size > 0) {
+      modelsFile.addImportDeclarations([
+        {
+          namedImports: [
+            ...Array.from(importedModels || [])
+          ],
+          moduleSpecifier: "@azure-rest/core-client"
+        }
+      ]);
+    }
     return { path: filePath, content: modelsFile.getFullText() };
   }
   return undefined;

package/src/buildSerializeHelper.ts

@@ -0,0 +1,42 @@
+import { RLCModel } from "./interfaces.js";
+import * as path from "path";
+// @ts-ignore: to fix the handlebars issue
+import hbs from "handlebars";
+import {
+  hasMultiCollection,
+  hasPipeCollection,
+  hasSsvCollection,
+  hasTsvCollection
+} from "./helpers/operationHelpers.js";
+import {
+  buildMultiCollectionContent,
+  buildPipeCollectionContent,
+  buildSsvCollectionContent,
+  buildTsvCollectionContent
+} from "./static/serializeHelper.js";
+
+export function buildSerializeHelper(model: RLCModel) {
+  let serializeHelperContent = "";
+  if (hasMultiCollection(model)) {
+    serializeHelperContent += "\n" + buildMultiCollectionContent;
+  }
+  if (hasPipeCollection(model)) {
+    serializeHelperContent += "\n" + buildPipeCollectionContent;
+  }
+  if (hasSsvCollection(model)) {
+    serializeHelperContent += "\n" + buildSsvCollectionContent;
+  }
+  if (hasTsvCollection(model)) {
+    serializeHelperContent += "\n" + buildTsvCollectionContent;
+  }
+  if (serializeHelperContent !== "") {
+    const readmeFileContents = hbs.compile(serializeHelperContent, {
+      noEscape: true
+    });
+    const { srcPath } = model;
+    return {
+      path: path.join(srcPath, "serializeHelper.ts"),
+      content: readmeFileContents({})
+    };
+  }
+}

package/src/buildTopLevelIndexFile.ts

@@ -4,6 +4,8 @@
 import { NameType, normalizeName } from "./helpers/nameUtils.js";
 import { RLCModel } from "./interfaces.js";
 import { Project } from "ts-morph";
+import * as path from "path";
+import { getRelativePartFromSrcPath } from "./helpers/pathUtils.js";
 
 const batchOutputFolder: [string, string, string][] = [];
 
@@ -17,7 +19,7 @@ export function buildTopLevelIndex(model: RLCModel) {
   if (srcPath) {
     const clientName = model.libraryName;
     const moduleName = normalizeName(clientName, NameType.File);
-    const relativePath = srcPath.replace("/src", "");
+    const relativePath = "./" + getRelativePartFromSrcPath(srcPath);
     batchOutputFolder.push([relativePath, clientName, moduleName]);
   }
   if (
@@ -40,7 +42,11 @@ export function buildTopLevelIndex(model: RLCModel) {
     indexFile.addExportDeclaration({
       namedExports: [...allModules]
     });
-    // TODO handle multi-client path issue in cald
-    return { path: "", content: indexFile.getFullText() };
+    const content = indexFile.getFullText();
+    const filePath = path.join(
+      srcPath.substring(0, srcPath.indexOf(path.sep + "src") + 4),
+      `index.ts`
+    );
+    return { path: filePath, content };
   }
 }

package/src/helpers/nameConstructors.ts

@@ -18,7 +18,7 @@ export function getResponseTypeName(
   operationName?: string,
   statusCode?: string
 ): string {
-  if (Boolean(operationName)) {
+  if (operationName) {
     baseNameOrOperationGroup = getResponseBaseName(
       baseNameOrOperationGroup,
       operationName!,
@@ -79,7 +79,7 @@ export function getParameterTypeName(
   baseNameOrOperationGroup: string,
   operationName?: string
 ) {
-  if (Boolean(operationName)) {
+  if (operationName) {
     baseNameOrOperationGroup = getParameterBaseName(
       baseNameOrOperationGroup,
       operationName!

package/src/helpers/nameUtils.ts

@@ -202,7 +202,7 @@ function toCasing(str: string, casing: CasingConvention): string {
 }
 
 function getNameParts(name: string) {
-  let parts = name.split(/[-._ ]+/);
+  const parts = name.split(/[-._ ]+/);
 
   return parts.length > 0 ? parts : [name];
 }

package/src/helpers/operationHelpers.ts

@@ -13,7 +13,7 @@ import {
   RLCModel,
   SchemaContext
 } from "../interfaces.js";
-import { pascalCase } from "./nameUtils.js";
+import { NameType, normalizeName, pascalCase } from "./nameUtils.js";
 import { isObjectSchema } from "./schemaHelpers.js";
 
 export function buildMethodDefinitions(
@@ -26,7 +26,7 @@ export function buildMethodDefinitions(
 
     for (const method of verbMethods) {
       const description = method.description;
-      let areAllOptional = method.hasOptionalOptions;
+      const areAllOptional = method.hasOptionalOptions;
 
       methodDefinitions.push({
         name: key,
@@ -52,7 +52,7 @@ export function getPathParamDefinitions(
 ): OptionalKind<ParameterDeclarationStructure>[] {
   return pathParams.map(({ name, type, description }) => {
     return {
-      name,
+      name: normalizeName(name, NameType.Parameter),
       type,
       description
     };
@@ -67,6 +67,22 @@ export function hasPollingOperations(model: RLCModel) {
   return Boolean(model.annotations?.hasLongRunning);
 }
 
+export function hasMultiCollection(model: RLCModel) {
+  return Boolean(model.annotations?.hasMultiCollection);
+}
+
+export function hasPipeCollection(model: RLCModel) {
+  return Boolean(model.annotations?.hasPipeCollection);
+}
+
+export function hasSsvCollection(model: RLCModel) {
+  return Boolean(model.annotations?.hasSsvCollection);
+}
+
+export function hasTsvCollection(model: RLCModel) {
+  return Boolean(model.annotations?.hasTsvCollection);
+}
+
 export function hasUnexpectedHelper(model: RLCModel) {
   const pathDictionary = model.paths;
   for (const details of Object.values(pathDictionary)) {

package/src/helpers/pathUtils.ts

@@ -0,0 +1,9 @@
+import * as path from "path";
+
+export function getRelativePartFromSrcPath(srcPath: string) {
+  const sep = srcPath.includes(path.sep + "src") ? path.sep : "/";
+  const relativePart = srcPath.substring(srcPath.indexOf(sep + "src") + 4);
+  return relativePart.startsWith(sep)
+    ? relativePart.substring(1)
+    : relativePart;
+}

package/src/helpers/schemaHelpers.ts

@@ -22,4 +22,4 @@ export function isConstantSchema(schema: Schema) {
     return true;
   }
   return false;
-}
+}

package/src/helpers/shortcutMethods.ts

@@ -13,7 +13,7 @@ import { NameType, normalizeName } from "./nameUtils.js";
 export function generateMethodShortcuts(
   paths: Paths
 ): OptionalKind<InterfaceDeclarationStructure>[] {
-  let keys: Record<string, OptionalKind<MethodSignatureStructure>[]> = {};
+  const keys: Record<string, OptionalKind<MethodSignatureStructure>[]> = {};
   for (const path in paths) {
     const groupName = paths[path].operationGroupName;
     const definitions = buildOperationDefinitions(paths[path]);

package/src/index.ts

@@ -26,3 +26,4 @@ export * from "./metadata/buildRollupConfig.js";
 export * from "./metadata/buildTsConfig.js";
 export * from "./metadata/buildESLintConfig.js";
 export * from "./metadata/buildLicenseFile.js";
+export * from "./buildSerializeHelper.js"

package/src/interfaces.ts

@@ -6,7 +6,7 @@ export interface RLCModel {
   paths: Paths;
   options?: RLCOptions;
   schemas: Schema[];
-  apiVersionParam?: Parameter;
+  apiVersionInQueryParam?: Parameter;
   parameters?: OperationParameter[];
   responses?: OperationResponse[];
   importSet?: Map<ImportKind, Set<string>>;
@@ -14,14 +14,24 @@ export interface RLCModel {
   urlInfo?: UrlInfo;
 }
 
+export interface PathTemplateApiVersion {
+  value: string;
+  templateName: string;
+}
+
 export interface UrlInfo {
   endpoint?: string;
   urlParameters?: PathParameter[];
+  pathTemplateApiVersion?: PathTemplateApiVersion;
 }
 export interface AnnotationDetails {
   hasPaging?: boolean;
   hasLongRunning?: boolean;
   pageDetails?: PagingDetails;
+  hasMultiCollection?: boolean;
+  hasPipeCollection?: boolean;
+  hasSsvCollection?: boolean;
+  hasTsvCollection?: boolean;
 }
 
 export interface PagingDetails {
@@ -63,6 +73,7 @@ export type PathParameter = {
   name: string;
   type: string;
   description?: string;
+  value?: string | number | boolean;
 };
 
 export interface OperationAnnotations {
@@ -89,6 +100,7 @@ export interface RLCOptions {
   productDocLink?: string;
   serviceInfo?: ServiceInfo;
   azureArm?: boolean;
+  sourceFrom?: "Cadl" | "Swagger";
 }
 
 export interface ServiceInfo {
@@ -129,6 +141,9 @@ export interface Schema {
   default?: any;
   readOnly?: boolean;
   usage?: SchemaContext[];
+  alias?: string;
+  outputAlias?: string;
+  fromCore?: boolean;
 }
 
 export interface ObjectSchema extends Schema {

package/src/metadata/buildPackageFile.ts

@@ -2,12 +2,18 @@
 // Licensed under the MIT License.
 
 import { Project } from "ts-morph";
+import { NameType, normalizeName } from "../helpers/nameUtils.js";
 import {
   hasPagingOperations,
   hasPollingOperations
 } from "../helpers/operationHelpers.js";
+import { getRelativePartFromSrcPath } from "../helpers/pathUtils.js";
 import { RLCModel } from "../interfaces.js";
 
+let hasPaging = false;
+let hasLRO = false;
+let clientFilePaths: string[] = [];
+
 export function buildPackageFile(model: RLCModel, hasSamplesGenerated = false) {
   const generateMetadata = Boolean(model.options?.generateMetadata);
   if (!generateMetadata) {
@@ -43,23 +49,36 @@ function restLevelPackage(model: RLCModel, hasSamplesGenerated: boolean) {
     return;
   }
 
+  clientFilePaths.push(getClientFilePath(model));
+  hasPaging = hasPaging || hasPagingOperations(model);
+  hasLRO = hasLRO || hasPollingOperations(model);
+
   const {
     packageDetails,
     generateTest,
     generateSample,
     azureOutputDirectory,
     azureSdkForJs,
-    isCadlTest
+    isCadlTest,
+    sourceFrom,
+    multiClient,
+    batch
   } = model.options;
+  if (
+    multiClient &&
+    batch &&
+    batch.length > 1 &&
+    clientFilePaths.length < batch.length
+  ) {
+    return;
+  }
 
   const clientPackageName = packageDetails.name;
   let apiRefUrlQueryParameter: string = "";
   if (packageDetails.version.includes("beta")) {
     apiRefUrlQueryParameter = "?view=azure-node-preview";
   }
-  const description = packageDetails.description;
-  const hasPaging = hasPagingOperations(model);
-  const hasLRO = hasPollingOperations(model);
+
   const packageInfo: Record<string, any> = {
     name: `${packageDetails.name}`,
     "sdk-type": "client",
@@ -96,23 +115,32 @@ function restLevelPackage(model: RLCModel, hasSamplesGenerated: boolean) {
       "build:samples": "echo skipped.",
       "build:test": "echo skipped.",
       "build:debug": "echo skipped.",
-      "check-format":
-        'prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.ts" "test/**/*.ts" "samples-dev/**/*.ts" "*.{js,json}"',
+      "check-format": `prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.ts" "*.{js,json}" ${appendPathWhenFormat(
+        generateTest,
+        generateSample
+      )}`,
       clean:
         "rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log",
       "execute:samples": "echo skipped",
       "extract-api":
         "rimraf review && mkdirp ./review && api-extractor run --local",
-      format:
-        'prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.ts" "test/**/*.ts" "samples-dev/**/*.ts" "*.{js,json}"',
+      format: `prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.ts" "*.{js,json}" ${appendPathWhenFormat(
+        generateTest,
+        generateSample
+      )}`,
       "generate:client":
-        "autorest --typescript swagger/README.md && npm run format",
+        sourceFrom === "Swagger"
+          ? "autorest --typescript swagger/README.md && npm run format"
+          : "echo skipped",
       "integration-test:browser": "echo skipped",
       "integration-test:node": "echo skipped",
       "integration-test": "echo skipped",
-      "lint:fix":
-        "eslint package.json api-extractor.json src test --ext .ts --fix --fix-type [problem,suggestion]",
-      lint: "eslint package.json api-extractor.json src test --ext .ts",
+      "lint:fix": `eslint package.json api-extractor.json src ${appednPathWhenLint(
+        generateTest
+      )} --ext .ts --fix --fix-type [problem,suggestion]`,
+      lint: `eslint package.json api-extractor.json src ${appednPathWhenLint(
+        generateTest
+      )} --ext .ts`,
       pack: "npm pack 2>&1",
       "test:browser": "echo skipped",
       "test:node": "echo skipped",
@@ -125,28 +153,29 @@ function restLevelPackage(model: RLCModel, hasSamplesGenerated: boolean) {
     autoPublish: false,
     dependencies: {
       "@azure/core-auth": "^1.3.0",
-      "@azure-rest/core-client": "1.0.0-beta.10",
+      "@azure-rest/core-client": "^1.1.0",
       "@azure/core-rest-pipeline": "^1.8.0",
       "@azure/logger": "^1.0.0",
       tslib: "^2.2.0",
       ...(hasPaging && {
-        "@azure/core-paging": "^1.2.0"
+        "@azure/core-paging": "^1.5.0"
       }),
       ...(hasLRO && {
-        "@azure/core-lro": "^2.2.0"
+        "@azure/core-lro": "^2.5.0",
+        "@azure/abort-controller": "^1.0.0"
       })
     },
     devDependencies: {
       "@microsoft/api-extractor": "^7.31.1",
       autorest: "latest",
       "@types/node": "^14.0.0",
-      dotenv: "^8.2.0",
+      dotenv: "^16.0.0",
       eslint: "^8.0.0",
-      mkdirp: "^1.0.4",
-      prettier: "2.2.1",
+      mkdirp: "^2.1.2",
+      prettier: "^2.5.1",
       rimraf: "^3.0.0",
       "source-map-support": "^0.5.9",
-      typescript: "~4.6.0"
+      typescript: "~4.8.0"
     }
   };
 
@@ -156,13 +185,21 @@ function restLevelPackage(model: RLCModel, hasSamplesGenerated: boolean) {
 
   if (azureSdkForJs) {
     packageInfo["//metadata"] = {
-      constantPaths: [
-        {
-          path: "swagger/README.md",
-          prefix: "package-version"
-        }
-      ]
+      constantPaths: []
     };
+    clientFilePaths.forEach((path) => {
+      packageInfo["//metadata"].constantPaths.push({
+        path,
+        prefix: "userAgentInfo"
+      });
+    });
+    // Only generate this from Swagger spec
+    if (sourceFrom === "Swagger") {
+      packageInfo["//metadata"].constantPaths.push({
+        path: "swagger/README.md",
+        prefix: "package-version"
+      });
+    }
     packageInfo.scripts["build"] =
       "npm run clean && tsc -p . && dev-tool run bundle && mkdirp ./review && api-extractor run --local";
     packageInfo.scripts["build:debug"] =
@@ -177,9 +214,9 @@ function restLevelPackage(model: RLCModel, hasSamplesGenerated: boolean) {
     packageInfo.scripts[
       "minify"
     ] = `uglifyjs -c -m --comments --source-map "content='./dist/index.js.map'" -o ./dist/index.min.js ./dist/index.js`;
-    packageInfo.devDependencies["@rollup/plugin-commonjs"] = "^21.0.1";
-    packageInfo.devDependencies["@rollup/plugin-json"] = "^4.1.0";
-    packageInfo.devDependencies["@rollup/plugin-multi-entry"] = "^4.1.0";
+    packageInfo.devDependencies["@rollup/plugin-commonjs"] = "^24.0.0";
+    packageInfo.devDependencies["@rollup/plugin-json"] = "^6.0.0";
+    packageInfo.devDependencies["@rollup/plugin-multi-entry"] = "^6.0.0";
     packageInfo.devDependencies["@rollup/plugin-node-resolve"] = "^13.1.3";
     packageInfo.devDependencies["rollup"] = "^2.66.1";
     packageInfo.devDependencies["rollup-plugin-sourcemaps"] = "^0.6.3";
@@ -196,6 +233,7 @@ function restLevelPackage(model: RLCModel, hasSamplesGenerated: boolean) {
     packageInfo.devDependencies["@azure/identity"] = "^2.0.1";
     packageInfo.devDependencies["@azure-tools/test-recorder"] = "^2.0.0";
     packageInfo.devDependencies["mocha"] = "^7.1.1";
+    packageInfo.devDependencies["@types/mocha"] = "^7.0.2";
     packageInfo.devDependencies["mocha-junit-reporter"] = "^1.18.0";
     packageInfo.devDependencies["cross-env"] = "^7.0.2";
     packageInfo.devDependencies["@types/chai"] = "^4.2.8";
@@ -203,17 +241,15 @@ function restLevelPackage(model: RLCModel, hasSamplesGenerated: boolean) {
     packageInfo.devDependencies["cross-env"] = "^7.0.2";
     packageInfo.devDependencies["karma-chrome-launcher"] = "^3.0.0";
     packageInfo.devDependencies["karma-coverage"] = "^2.0.0";
-    packageInfo.devDependencies["karma-edge-launcher"] = "^0.4.2";
     packageInfo.devDependencies["karma-env-preprocessor"] = "^0.1.1";
     packageInfo.devDependencies["karma-firefox-launcher"] = "^1.1.0";
-    packageInfo.devDependencies["karma-ie-launcher"] = "^1.0.0";
     packageInfo.devDependencies["karma-junit-reporter"] = "^2.0.1";
     packageInfo.devDependencies["karma-mocha-reporter"] = "^2.2.5";
     packageInfo.devDependencies["karma-mocha"] = "^2.0.1";
     packageInfo.devDependencies["karma-source-map-support"] = "~1.4.0";
     packageInfo.devDependencies["karma-sourcemap-loader"] = "^0.3.8";
     packageInfo.devDependencies["karma"] = "^6.2.0";
-    packageInfo.devDependencies["nyc"] = "^14.0.0";
+    packageInfo.devDependencies["nyc"] = "^15.0.0";
     packageInfo.devDependencies["source-map-support"] = "^0.5.9";
     packageInfo.scripts["test"] =
       "npm run clean && npm run build:test && npm run unit-test";
@@ -269,3 +305,30 @@ function restLevelPackage(model: RLCModel, hasSamplesGenerated: boolean) {
 
   return packageInfo;
 }
+
+function appendPathWhenFormat(
+  generateTest?: boolean,
+  generateSample?: boolean
+) {
+  let path = "";
+  if (generateTest) {
+    path = path + ` "test/**/*.ts"`;
+  }
+  if (generateSample) {
+    path = path + ` "samples-dev/**/*.ts"`;
+  }
+  return path;
+}
+
+function appednPathWhenLint(generateTest?: boolean) {
+  return generateTest ? "test" : "";
+}
+
+function getClientFilePath(model: RLCModel) {
+  const { srcPath } = model;
+  const sdkReletivePart = getRelativePartFromSrcPath(srcPath);
+  const clientFilename = normalizeName(model.libraryName, NameType.File);
+  return sdkReletivePart
+    ? `src/${sdkReletivePart}/${clientFilename}.ts`
+    : `src/${clientFilename}.ts`;
+}

package/src/metadata/buildReadmeFile.ts

@@ -35,7 +35,7 @@ Key links:
 
 ### Currently supported environments
 
-- Node.js version 14.x.x or higher
+- LTS versions of Node.js
 
 ### Prerequisites
 
@@ -72,7 +72,7 @@ AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_CLIENT_SECRET
 Enabling logging may help uncover useful information about failures. In order to see a log of HTTP requests and responses, set the \`AZURE_LOG_LEVEL\` environment variable to \`info\`. Alternatively, logging can be enabled at runtime by calling \`setLogLevel\` in the \`@azure/logger\`:
 
 \`\`\`javascript
-import { setLogLevel } from "@azure/logger";
+const { setLogLevel } = require("@azure/logger");
 
 setLogLevel("info");
 \`\`\`
@@ -168,7 +168,7 @@ function createMetadata(model: RLCModel): Metadata | undefined {
   const clientPackageName = packageDetails?.name;
   const clientClassName = getClientName(model);
   const serviceName = getServiceName(model);
-  var apiRefUrlQueryParameter: string = "";
+  let apiRefUrlQueryParameter: string = "";
   if (packageDetails?.version.includes("beta")) {
     apiRefUrlQueryParameter = "?view=azure-node-preview";
   }

package/src/static/paginateContent.ts

@@ -156,7 +156,7 @@ function checkPagingRequest(response: PathUncheckedResponse): void {
   ];
   if (!Http2xxStatusCodes.includes(response.status)) {
     throw createRestError(
-      \`Pagination failed with unexpected statusCode \${response.status\}\`,
+      \`Pagination failed with unexpected statusCode \${response.status}\`,
       response
     );
   }