@azure-tools/typespec-ts 0.11.0 → 0.12.0-alpha.20230501.1

package/test/unit/util/emitUtil.ts

@@ -13,7 +13,7 @@ import { transformToParameterTypes } from "../../../src/transform/transformParam
 import { transformSchemas } from "../../../src/transform/transformSchemas.js";
 import { transformPaths } from "../../../src/transform/transformPaths.js";
 import { transformUrlInfo } from "../../../src/transform/transform.js";
-import { transformApiVersionParam } from "../../../src/transform/transformApiVersionParam.js";
+import { transformApiVersionInfo } from "../../../src/transform/transformApiVersionInfo.js";
 import { transformToResponseTypes } from "../../../src/transform/transformResponses.js";
 import { getCredentialInfo } from "../../../src/transform/transfromRLCOptions.js";
 
@@ -101,12 +101,13 @@ export async function emitClientFactoryFromCadl(
   const urlInfo = transformUrlInfo(program, dpgContext);
   const creadentialInfo = getCredentialInfo(program, {});
   const clients = listClients(dpgContext);
-  let apiVersionInQueryParam;
+  let apiVersionInfo;
   if (clients && clients[0]) {
-    apiVersionInQueryParam = transformApiVersionParam(
+    apiVersionInfo = transformApiVersionInfo(
       clients[0],
       program,
-      dpgContext
+      dpgContext,
+      urlInfo
     );
   }
 
@@ -116,7 +117,7 @@ export async function emitClientFactoryFromCadl(
     schemas: [],
     paths: {},
     urlInfo,
-    apiVersionInQueryParam,
+    apiVersionInfo,
     options: {
       packageDetails: {
         name: "test",

package/test/unit/util/testUtil.ts

@@ -5,7 +5,7 @@ import { RestTestLibrary } from "@typespec/rest/testing";
 import { HttpTestLibrary } from "@typespec/http/testing";
 import { VersioningTestLibrary } from "@typespec/versioning/testing";
 import { AzureCoreTestLibrary } from "@azure-tools/typespec-azure-core/testing";
-import { DpgContext } from "@azure-tools/typespec-client-generator-core";
+import { SdkContext } from "@azure-tools/typespec-client-generator-core";
 import { assert } from "chai";
 import { format } from "prettier";
 import { prettierTypeScriptOptions } from "../../../src/lib.js";
@@ -60,7 +60,7 @@ export async function rlcEmitterFor(
   return host;
 }
 
-export function createDpgContextTestHelper(program: Program): DpgContext {
+export function createDpgContextTestHelper(program: Program): SdkContext {
   const defaultOptions = {
     generateProtocolMethods: true,
     generateConvenienceMethods: true,
@@ -72,7 +72,7 @@ export function createDpgContextTestHelper(program: Program): DpgContext {
     program: program,
     generateProtocolMethods: resolvedOptions.generateProtocolMethods,
     generateConvenienceMethods: resolvedOptions.generateConvenienceMethods
-  } as DpgContext;
+  } as SdkContext;
 }
 
 export function assertEqualContent(actual: string, expected: string) {

package/dist/src/transform/transformAnnotationDetails.d.ts

@@ -1,6 +0,0 @@
-import { Client, DpgContext } from "@azure-tools/typespec-client-generator-core";
-import { AnnotationDetails } from "@azure-tools/rlc-common";
-import { Program, Type } from "@typespec/compiler";
-export declare function transformAnnotationDetails(program: Program, client: Client, dpgContext: DpgContext): AnnotationDetails | undefined;
-export declare function getPageable(program: Program, entity: Type): string | undefined;
-//# sourceMappingURL=transformAnnotationDetails.d.ts.map

package/dist/src/transform/transformAnnotationDetails.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"transformAnnotationDetails.d.ts","sourceRoot":"","sources":["../../../src/transform/transformAnnotationDetails.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EACN,UAAU,EAGX,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAA4B,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAS7E,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACrB,iBAAiB,GAAG,SAAS,CA+D/B;AAED,wBAAgB,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,IAAI,GACX,MAAM,GAAG,SAAS,CAEpB"}

package/dist/src/transform/transformAnnotationDetails.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"transformAnnotationDetails.js","sourceRoot":"","sources":["../../../src/transform/transformAnnotationDetails.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,mBAAmB,EACnB,8BAA8B,EAC/B,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAAE,iBAAiB,EAAwB,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAiB,MAAM,gBAAgB,CAAC;AACjE,OAAO,EACL,mBAAmB,EACnB,0BAA0B,EAC1B,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,MAAM,UAAU,0BAA0B,CACxC,OAAgB,EAChB,MAAc,EACd,UAAsB;IAEtB,8CAA8C;IAC9C,MAAM,iBAAiB,GAAG;QACxB,cAAc,EAAE,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC;KAClE,CAAC;IACF,MAAM,OAAO,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IACvE,MAAM,aAAa,GAAG,2BAA2B,CAC/C,OAAO,EACP,MAAM,EACN,UAAU,CACX,CAAC;IACF,IAAI,OAAO,EAAE;QACX,OAAO;YACL,GAAG,OAAO;YACV,GAAG,iBAAiB;YACpB,GAAG,aAAa;SACjB,CAAC;KACH;IACD,uDAAuD;IACvD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChE,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;QAC5C,MAAM,UAAU,GAAG,8BAA8B,CAC/C,UAAU,EACV,cAAc,CACf,CAAC;QACF,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE;YAC3B,MAAM,KAAK,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;YAC/D,IAAI,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE;gBACzC,MAAM,YAAY,GAChB,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC;gBACtD,IAAI,YAAY,EAAE;oBAChB,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;iBAC7B;aACF;SACF;KACF;IACD,MAAM,gBAAgB,GAAG,8BAA8B,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC5E,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE;QACvC,MAAM,KAAK,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;QACrE,IAAI,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE;YACzC,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC;YACzE,IAAI,YAAY,EAAE;gBAChB,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;aAC7B;SACF;KACF;IACD,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE;QACxB,OAAO;YACL,GAAG,iBAAiB;YACpB,GAAG,aAAa;SACjB,CAAC;KACH;IACD,OAAO;QACL,GAAG,iBAAiB;QACpB,SAAS,EAAE,IAAI;QACf,WAAW,EAAE;YACX,SAAS,EAAE,CAAC,OAAO,CAAC;YACpB,aAAa,EAAE,CAAC,GAAG,SAAS,CAAC;YAC7B,eAAe,EAAE,SAAS,CAAC,IAAI,GAAG,CAAC;SACpC;QACD,GAAG,aAAa;KACjB,CAAC;AACJ,CAAC;AACD,MAAM,qBAAqB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AACjD,MAAM,UAAU,WAAW,CACzB,OAAgB,EAChB,MAAY;IAEZ,OAAO,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,yBAAyB,CAChC,OAAgB,EAChB,MAAc,EACd,UAAsB;IAEtB,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE;QACrD,OAAO;KACR;IACD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,qBAAqB;IACrB,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1B,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChE,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;QAC5C,MAAM,UAAU,GAAG,8BAA8B,CAC/C,UAAU,EACV,cAAc,CACf,CAAC;QACF,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE;YAC3B,MAAM,KAAK,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;YAC/D,iCAAiC,CAAC,KAAK,CAAC,CAAC;SAC1C;KACF;IACD,MAAM,gBAAgB,GAAG,8BAA8B,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC5E,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE;QACvC,MAAM,KAAK,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;QACrE,iCAAiC,CAAC,KAAK,CAAC,CAAC;KAC1C;IAED,SAAS,iCAAiC,CAAC,KAAoB;QAC7D,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,SAAS,EAAE;YACtC,MAAM,KAAK,GAAG,0BAA0B,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAa,CAAC,CAAC;YAC1E,IAAI,KAAK,EAAE;gBACT,MAAM,YAAY,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBAC9C,IAAI,YAAY,EAAE;oBAChB,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;iBAC7B;gBACD,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;gBACtC,IAAI,QAAQ,EAAE;oBACZ,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;iBACzB;gBACD,sEAAsE;gBACtE,SAAS;aACV;SACF;IACH,CAAC;IACD,uFAAuF;IACvF,kCAAkC;IAClC,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,GAAG,CAAC,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC;IACjE,OAAO;QACL,SAAS,EAAE,IAAI;QACf,WAAW,EAAE;YACX,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC;YACzB,aAAa,EAAE,CAAC,GAAG,SAAS,CAAC;YAC7B,eAAe;SAChB;KACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,KAA0B;;IACnD,MAAM,cAAc,GAAG,MAAA,KAAK,CAAC,YAAY,0CAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACtD,IAAI,cAAc,EAAE;QAClB,mEAAmE;QACnE,OAAO,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;KAClD;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,aAAa,CAAC,KAA0B;;IAC/C,MAAM,cAAc,GAAG,MAAA,KAAK,CAAC,SAAS,0CAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACnD,IAAI,cAAc,EAAE;QAClB,mEAAmE;QACnE,OAAO,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;KAClD;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,2BAA2B,CAClC,OAAgB,EAChB,MAAc,EACd,UAAsB;IAEtB,IAAI,kBAAkB,GAAG,KAAK,CAAC;IAC/B,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAC7B,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAC7B,MAAM,eAAe,GAAG,mBAAmB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChE,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE;QAC5C,MAAM,UAAU,GAAG,8BAA8B,CAC/C,UAAU,EACV,cAAc,CACf,CAAC;QACF,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE;YAC3B,MAAM,KAAK,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;YAC/D,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBAChD,MAAM,aAAa,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAC;gBACzD,kBAAkB,GAAG,kBAAkB;oBACrC,CAAC,CAAC,kBAAkB;oBACpB,CAAC,CAAC,aAAa,CAAC,kBAAkB,CAAC;gBACrC,iBAAiB,GAAG,iBAAiB;oBACnC,CAAC,CAAC,iBAAiB;oBACnB,CAAC,CAAC,aAAa,CAAC,iBAAiB,CAAC;gBACpC,gBAAgB,GAAG,gBAAgB;oBACjC,CAAC,CAAC,gBAAgB;oBAClB,CAAC,CAAC,aAAa,CAAC,gBAAgB,CAAC;gBACnC,gBAAgB,GAAG,gBAAgB;oBACjC,CAAC,CAAC,gBAAgB;oBAClB,CAAC,CAAC,aAAa,CAAC,gBAAgB,CAAC;YACrC,CAAC,CAAC,CAAC;SACJ;KACF;IACD,MAAM,gBAAgB,GAAG,8BAA8B,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC5E,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE;QACvC,MAAM,KAAK,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;QACrE,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAChD,MAAM,aAAa,GAAG,uBAAuB,CAAC,SAAS,CAAC,CAAC;YACzD,kBAAkB,GAAG,kBAAkB;gBACrC,CAAC,CAAC,kBAAkB;gBACpB,CAAC,CAAC,aAAa,CAAC,kBAAkB,CAAC;YACrC,iBAAiB,GAAG,iBAAiB;gBACnC,CAAC,CAAC,iBAAiB;gBACnB,CAAC,CAAC,aAAa,CAAC,iBAAiB,CAAC;YACpC,gBAAgB,GAAG,gBAAgB;gBACjC,CAAC,CAAC,gBAAgB;gBAClB,CAAC,CAAC,aAAa,CAAC,gBAAgB,CAAC;YACnC,gBAAgB,GAAG,gBAAgB;gBACjC,CAAC,CAAC,gBAAgB;gBAClB,CAAC,CAAC,aAAa,CAAC,gBAAgB,CAAC;QACrC,CAAC,CAAC,CAAC;KACJ;IACD,OAAO;QACL,kBAAkB;QAClB,iBAAiB;QACjB,gBAAgB;QAChB,gBAAgB;KACjB,CAAC;AACJ,CAAC"}

package/dist/src/transform/transformApiVersionParam.d.ts

@@ -1,5 +0,0 @@
-import { Client, DpgContext } from "@azure-tools/typespec-client-generator-core";
-import { Program } from "@typespec/compiler";
-import { Parameter } from "@azure-tools/rlc-common";
-export declare function transformApiVersionParam(client: Client, program: Program, dpgContext: DpgContext): Parameter | undefined;
-//# sourceMappingURL=transformApiVersionParam.d.ts.map

package/dist/src/transform/transformApiVersionParam.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"transformApiVersionParam.d.ts","sourceRoot":"","sources":["../../../src/transform/transformApiVersionParam.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,UAAU,EAIX,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAqB,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAIpD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,GACrB,SAAS,GAAG,SAAS,CAuFvB"}

package/dist/src/transform/transformApiVersionParam.js

@@ -1,76 +0,0 @@
-import { isApiVersion, listOperationGroups, listOperationsInOperationGroup } from "@azure-tools/typespec-client-generator-core";
-import { ignoreDiagnostics } from "@typespec/compiler";
-import { getHttpOperation } from "@typespec/http";
-import { getDefaultService, getDefaultValue } from "./transform.js";
-export function transformApiVersionParam(client, program, dpgContext) {
-    var _a, _b, _c;
-    const operationGroups = listOperationGroups(dpgContext, client);
-    let apiVersionParam;
-    let hasClientApiVersion = false;
-    for (const operationGroup of operationGroups) {
-        const operations = listOperationsInOperationGroup(dpgContext, operationGroup);
-        for (const op of operations) {
-            const route = ignoreDiagnostics(getHttpOperation(program, op));
-            const apiVersions = route.parameters.parameters.filter((p) => p.type === "query" &&
-                isApiVersion(dpgContext, p) &&
-                getDefaultValue(program, dpgContext, p.param));
-            if (apiVersions.length === 1 &&
-                !hasClientApiVersion &&
-                !apiVersionParam) {
-                apiVersionParam = apiVersions[0];
-                hasClientApiVersion = true;
-            }
-            else if (apiVersions.length !== 1) {
-                hasClientApiVersion = false;
-                break;
-            }
-            else if (apiVersions.length == 1 &&
-                getDefaultValue(program, dpgContext, (_a = apiVersions[0]) === null || _a === void 0 ? void 0 : _a.param) !==
-                    getDefaultValue(program, dpgContext, apiVersionParam === null || apiVersionParam === void 0 ? void 0 : apiVersionParam.param)) {
-                hasClientApiVersion = false;
-                break;
-            }
-        }
-    }
-    const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-    for (const clientOp of clientOperations) {
-        const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-        const apiVersions = route.parameters.parameters.filter((p) => p.type === "query" &&
-            isApiVersion(dpgContext, p) &&
-            getDefaultValue(program, dpgContext, p.param));
-        if (apiVersions.length === 1 && !hasClientApiVersion && !apiVersionParam) {
-            apiVersionParam = apiVersions[0];
-            hasClientApiVersion = true;
-        }
-        else if (apiVersions.length !== 1) {
-            hasClientApiVersion = false;
-            break;
-        }
-        else if (apiVersions.length == 1 &&
-            getDefaultValue(program, dpgContext, (_b = apiVersions[0]) === null || _b === void 0 ? void 0 : _b.param) !==
-                getDefaultValue(program, dpgContext, apiVersionParam === null || apiVersionParam === void 0 ? void 0 : apiVersionParam.param)) {
-            hasClientApiVersion = false;
-            break;
-        }
-    }
-    const apiVersion = getDefaultValue(program, dpgContext, apiVersionParam === null || apiVersionParam === void 0 ? void 0 : apiVersionParam.param);
-    if (hasClientApiVersion && apiVersion && apiVersion !== "0000-00-00") {
-        return {
-            name: "api-version",
-            type: "constant",
-            default: apiVersion
-        };
-    }
-    const serviceApiVersion = (_c = getDefaultService(program)) === null || _c === void 0 ? void 0 : _c.version;
-    if (serviceApiVersion &&
-        serviceApiVersion &&
-        serviceApiVersion !== "0000-00-00") {
-        return {
-            name: "api-version",
-            type: "constant",
-            default: serviceApiVersion
-        };
-    }
-    return undefined;
-}
-//# sourceMappingURL=transformApiVersionParam.js.map

package/dist/src/transform/transformApiVersionParam.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"transformApiVersionParam.js","sourceRoot":"","sources":["../../../src/transform/transformApiVersionParam.ts"],"names":[],"mappings":"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"}

package/src/transform/transformApiVersionParam.ts

@@ -1,104 +0,0 @@
-import {
-  Client,
-  DpgContext,
-  isApiVersion,
-  listOperationGroups,
-  listOperationsInOperationGroup
-} from "@azure-tools/typespec-client-generator-core";
-import { ignoreDiagnostics, Program } from "@typespec/compiler";
-import { Parameter } from "@azure-tools/rlc-common";
-import { getHttpOperation } from "@typespec/http";
-import { getDefaultService, getDefaultValue } from "./transform.js";
-
-export function transformApiVersionParam(
-  client: Client,
-  program: Program,
-  dpgContext: DpgContext
-): Parameter | undefined {
-  const operationGroups = listOperationGroups(dpgContext, client);
-  let apiVersionParam;
-  let hasClientApiVersion = false;
-  for (const operationGroup of operationGroups) {
-    const operations = listOperationsInOperationGroup(
-      dpgContext,
-      operationGroup
-    );
-    for (const op of operations) {
-      const route = ignoreDiagnostics(getHttpOperation(program, op));
-      const apiVersions = route.parameters.parameters.filter(
-        (p) =>
-          p.type === "query" &&
-          isApiVersion(dpgContext, p) &&
-          getDefaultValue(program, dpgContext, p.param)
-      );
-      if (
-        apiVersions.length === 1 &&
-        !hasClientApiVersion &&
-        !apiVersionParam
-      ) {
-        apiVersionParam = apiVersions[0];
-        hasClientApiVersion = true;
-      } else if (apiVersions.length !== 1) {
-        hasClientApiVersion = false;
-        break;
-      } else if (
-        apiVersions.length == 1 &&
-        getDefaultValue(program, dpgContext, apiVersions[0]?.param) !==
-          getDefaultValue(program, dpgContext, apiVersionParam?.param)
-      ) {
-        hasClientApiVersion = false;
-        break;
-      }
-    }
-  }
-  const clientOperations = listOperationsInOperationGroup(dpgContext, client);
-  for (const clientOp of clientOperations) {
-    const route = ignoreDiagnostics(getHttpOperation(program, clientOp));
-    const apiVersions = route.parameters.parameters.filter(
-      (p) =>
-        p.type === "query" &&
-        isApiVersion(dpgContext, p) &&
-        getDefaultValue(program, dpgContext, p.param)
-    );
-    if (apiVersions.length === 1 && !hasClientApiVersion && !apiVersionParam) {
-      apiVersionParam = apiVersions[0];
-      hasClientApiVersion = true;
-    } else if (apiVersions.length !== 1) {
-      hasClientApiVersion = false;
-      break;
-    } else if (
-      apiVersions.length == 1 &&
-      getDefaultValue(program, dpgContext, apiVersions[0]?.param) !==
-        getDefaultValue(program, dpgContext, apiVersionParam?.param)
-    ) {
-      hasClientApiVersion = false;
-      break;
-    }
-  }
-
-  const apiVersion = getDefaultValue(
-    program,
-    dpgContext,
-    apiVersionParam?.param
-  );
-  if (hasClientApiVersion && apiVersion && apiVersion !== "0000-00-00") {
-    return {
-      name: "api-version",
-      type: "constant",
-      default: apiVersion
-    };
-  }
-  const serviceApiVersion = getDefaultService(program)?.version;
-  if (
-    serviceApiVersion &&
-    serviceApiVersion &&
-    serviceApiVersion !== "0000-00-00"
-  ) {
-    return {
-      name: "api-version",
-      type: "constant",
-      default: serviceApiVersion
-    };
-  }
-  return undefined;
-}

package/test/integration/generated/lro/lroBasic/src/clientDefinitions.ts

@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import {
-  CreateParameters,
-  GetParameters,
-  PollingParameters,
-} from "./parameters";
-import {
-  Create200Response,
-  Get200Response,
-  Polling200Response,
-} from "./responses";
-import { Client, StreamableMethod } from "@azure-rest/core-client";
-
-export interface Create {
-  /** Test for basic lro of put */
-  put(options?: CreateParameters): StreamableMethod<Create200Response>;
-  /** The final url */
-  get(options?: GetParameters): StreamableMethod<Get200Response>;
-}
-
-export interface Polling {
-  /** The polling url */
-  get(options?: PollingParameters): StreamableMethod<Polling200Response>;
-}
-
-export interface Routes {
-  /** Resource for '/lro/basic/put' has methods for the following verbs: put, get */
-  (path: "/lro/basic/put"): Create;
-  /** Resource for '/lro/basic/put/polling' has methods for the following verbs: get */
-  (path: "/lro/basic/put/polling"): Polling;
-}
-
-export type AzureLroClient = Client & {
-  path: Routes;
-};

package/test/integration/generated/lro/lroBasic/src/parameters.ts

@@ -1,8 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import { RequestParameters } from "@azure-rest/core-client";
-
-export type CreateParameters = RequestParameters;
-export type PollingParameters = RequestParameters;
-export type GetParameters = RequestParameters;

package/test/integration/generated/lro/lroBasic/src/responses.ts

@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import { HttpResponse } from "@azure-rest/core-client";
-
-/** The request has succeeded. */
-export interface Create200Response extends HttpResponse {
-  status: "200";
-  body: string;
-}
-
-/** The request has succeeded. */
-export interface Polling200Response extends HttpResponse {
-  status: "200";
-  body: string;
-}
-
-/** The request has succeeded. */
-export interface Get200Response extends HttpResponse {
-  status: "200";
-  body: string;
-}

package/test/integration/generated/lro/lroBasic/tspconfig.yaml

@@ -1,11 +0,0 @@
-emitters:
-  "../../../../../../../../../../../packages/typespec-ts/dist/src/index.js":
-    generateMetadata: true
-    generateTest: false
-    addCredentials: false
-    azureSdkForJs: false
-    isCadlTest: true
-    packageDetails:
-      name: "@msinternal/lro-basic"
-      description: "LRO Basic Test Service"
-      version: "1.0.0"

package/test/integration/generated/resiliency/devDriven/src/clientDefinitions.ts

@@ -1,75 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import {
-  GetModelParameters,
-  PostModelParameters,
-  GetProtocolPagesParameters,
-  GetConveniencePagesParameters,
-  LroParameters,
-} from "./parameters";
-import {
-  GetModel200Response,
-  PostModel200Response,
-  GetProtocolPages200Response,
-  GetProtocolPagesDefaultResponse,
-  GetConveniencePages200Response,
-  GetConveniencePagesDefaultResponse,
-  Lro200Response,
-} from "./responses";
-import { Client, StreamableMethod } from "@azure-rest/core-client";
-
-export interface GetModel {
-  /** Get models that you will either return to end users as a raw body, or with a model added during grow up. */
-  get(options?: GetModelParameters): StreamableMethod<GetModel200Response>;
-  /** Post either raw response as a model and pass in 'raw' for mode, or grow up your operation to take a model instead, and put in 'model' as mode. */
-  post(options: PostModelParameters): StreamableMethod<PostModel200Response>;
-}
-
-export interface GetProtocolPages {
-  /** Get pages of protocol bodies. */
-  get(
-    options?: GetProtocolPagesParameters
-  ): StreamableMethod<
-    GetProtocolPages200Response | GetProtocolPagesDefaultResponse
-  >;
-}
-
-export interface GetConveniencePages {
-  /** Get pages of models. */
-  get(
-    options?: GetConveniencePagesParameters
-  ): StreamableMethod<
-    GetConveniencePages200Response | GetConveniencePagesDefaultResponse
-  >;
-}
-
-export interface Lro {
-  /** Long running put request that will either return to end users a final payload of a raw body, or a final payload of a model after the SDK has grown up. */
-  put(options?: LroParameters): StreamableMethod<Lro200Response>;
-}
-
-export interface Routes {
-  /** Resource for '/resiliency/devdriven/customization/model/\{mode\}' has methods for the following verbs: get, post */
-  (
-    path: "/resiliency/devdriven/customization/model/{mode}",
-    mode: "raw" | "model"
-  ): GetModel;
-  /** Resource for '/resiliency/devdriven/customization/paging/protocol/products' has methods for the following verbs: get */
-  (
-    path: "/resiliency/devdriven/customization/paging/protocol/products"
-  ): GetProtocolPages;
-  /** Resource for '/resiliency/devdriven/customization/paging/convenience/products' has methods for the following verbs: get */
-  (
-    path: "/resiliency/devdriven/customization/paging/convenience/products"
-  ): GetConveniencePages;
-  /** Resource for '/resiliency/devdriven/customization/lro/\{mode\}' has methods for the following verbs: put */
-  (
-    path: "/resiliency/devdriven/customization/lro/{mode}",
-    mode: "raw" | "model"
-  ): Lro;
-}
-
-export type ResiliencyDevDrivenClient = Client & {
-  path: Routes;
-};

package/test/integration/generated/resiliency/devDriven/src/models.ts

@@ -1,8 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-/** Input to LRO call */
-export interface Input {
-  /** property on the input */
-  hello: string;
-}

package/test/integration/generated/resiliency/devDriven/src/outputModels.ts

@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import { Paged } from "@azure/core-paging";
-
-/** Product resource */
-export interface ProductOutput {
-  /** key of product */
-  readonly key: string;
-  /**
-   * received mode
-   *
-   * Possible values: raw, model
-   */
-  received: string;
-}
-
-/** Final response from LRO call */
-export interface LroProductOutput extends ProductOutput {
-  /** Provisioning state returned by the service */
-  provisioningState: string;
-}
-
-/** Paged collection of Product items */
-export type ProductListOutput = Paged<ProductOutput>;

package/test/integration/generated/resiliency/devDriven/src/parameters.ts

@@ -1,17 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import { RequestParameters } from "@azure-rest/core-client";
-import { Input } from "./models";
-
-export type GetModelParameters = RequestParameters;
-
-export interface PostModelBodyParam {
-  /** Please put {'hello': 'world!'} */
-  body: Input;
-}
-
-export type PostModelParameters = PostModelBodyParam & RequestParameters;
-export type GetProtocolPagesParameters = RequestParameters;
-export type GetConveniencePagesParameters = RequestParameters;
-export type LroParameters = RequestParameters;

package/test/integration/generated/resiliency/devDriven/src/responses.ts

@@ -1,62 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import { RawHttpHeaders } from "@azure/core-rest-pipeline";
-import { HttpResponse, ErrorResponse } from "@azure-rest/core-client";
-import {
-  ProductOutput,
-  ProductListOutput,
-  LroProductOutput,
-} from "./outputModels";
-
-/** Returns {'received': <mode>} */
-export interface GetModel200Response extends HttpResponse {
-  status: "200";
-  body: ProductOutput;
-}
-
-/** Returns {'received': <mode>} */
-export interface PostModel200Response extends HttpResponse {
-  status: "200";
-  body: ProductOutput;
-}
-
-/** The request has succeeded. */
-export interface GetProtocolPages200Response extends HttpResponse {
-  status: "200";
-  body: ProductListOutput;
-}
-
-export interface GetProtocolPagesDefaultHeaders {
-  /** String error code indicating what went wrong. */
-  "x-ms-error-code"?: string;
-}
-
-export interface GetProtocolPagesDefaultResponse extends HttpResponse {
-  status: string;
-  body: ErrorResponse;
-  headers: RawHttpHeaders & GetProtocolPagesDefaultHeaders;
-}
-
-/** The request has succeeded. */
-export interface GetConveniencePages200Response extends HttpResponse {
-  status: "200";
-  body: ProductListOutput;
-}
-
-export interface GetConveniencePagesDefaultHeaders {
-  /** String error code indicating what went wrong. */
-  "x-ms-error-code"?: string;
-}
-
-export interface GetConveniencePagesDefaultResponse extends HttpResponse {
-  status: string;
-  body: ErrorResponse;
-  headers: RawHttpHeaders & GetConveniencePagesDefaultHeaders;
-}
-
-/** Initial response with ProvisioningState='Succeeded' */
-export interface Lro200Response extends HttpResponse {
-  status: "200";
-  body: LroProductOutput;
-}

package/test/integration/generated/resiliency/devDriven/tspconfig.yaml

@@ -1,11 +0,0 @@
-emitters:
-  "../../../../../../../../../../../packages/typespec-ts/dist/src/index.js":
-    generateMetadata: true
-    generateTest: false
-    addCredentials: false
-    azureSdkForJs: false
-    isCadlTest: true
-    packageDetails:
-      name: "@msinternal/dev-driven"
-      description: "Dev Driven Test Service"
-      version: "1.0.0"

package/test/integration/generated/resiliency/srvDriven1/src/models.ts

@@ -1,6 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-export interface PostInput {
-  url: string;
-}

package/test/integration/generated/resiliency/srvDriven1/src/outputModels.ts

@@ -1,6 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-export interface MessageOutput {
-  message: string;
-}

package/test/integration/generated/resiliency/srvDriven1/src/resiliencyServiceDriven1.ts

@@ -1,31 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import { getClient, ClientOptions } from "@azure-rest/core-client";
-import { ResiliencyServiceDriven1Client } from "./clientDefinitions";
-
-/**
- * Initialize a new instance of `ResiliencyServiceDriven1Client`
- * @param options type: ClientOptions, the parameter for all optional parameters
- */
-export default function createClient(
-  options: ClientOptions = {}
-): ResiliencyServiceDriven1Client {
-  const baseUrl = options.baseUrl ?? `http://localhost:3000`;
-  options.apiVersion = options.apiVersion ?? "1.0.0";
-  const userAgentInfo = `azsdk-js-srv-driven-1-rest/1.0.0`;
-  const userAgentPrefix =
-    options.userAgentOptions && options.userAgentOptions.userAgentPrefix
-      ? `${options.userAgentOptions.userAgentPrefix} ${userAgentInfo}`
-      : `${userAgentInfo}`;
-  options = {
-    ...options,
-    userAgentOptions: {
-      userAgentPrefix,
-    },
-  };
-
-  const client = getClient(baseUrl, options) as ResiliencyServiceDriven1Client;
-
-  return client;
-}

package/test/integration/generated/resiliency/srvDriven2/src/models.ts

@@ -1,6 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-export interface PostInput {
-  url: string;
-}

package/test/integration/generated/resiliency/srvDriven2/src/outputModels.ts

@@ -1,6 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-export interface MessageOutput {
-  message: string;
-}