@azure-tools/typespec-ts 0.31.0 → 0.32.0

package/dist/src/modular/buildClassicalOperationGroups.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildClassicalOperationGroups.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAQrE,MAAM,UAAU,0BAA0B,CACxC,UAAsB,EACtB,SAA2B,EAC3B,MAAc;;IAEd,MAAM,qBAAqB,GAA4B,IAAI,GAAG,EAG3D,CAAC;IACJ,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QACpD,IAAI,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,wBAAwB,GAC5B,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC;gBAC5C,CAAC,CAAC,GAAG,uBAAuB,CACxB,cAAc,EACd,QAAQ,CAAC,IAAI,EACb,GAAG,EACH,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAC/C,QAAQ;gBACX,CAAC,CAAC,0EAA0E;oBAC1E,+DAA+D;oBAC/D,OAAO,CAAC;YAEd,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;YACnC,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC;YACpD,MAAM,WAAW,GACf,MAAA,qBAAqB,CAAC,GAAG,CAAC,wBAAwB,CAAC,mCACnD,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAChC,GAAG,OAAO,IACR,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EACpD,WAAW,wBAAwB,KAAK,CACzC,CAAC;YACJ,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;YAEvE,sCAAsC;YACtC,6IAA6I;YAC7I,YAAY,CACV,OAAO,EACP,WAAW,EACX,SAAS,CAAC,OAAO,EACjB,SAAS,EACT,cAAc,CAAC,oBAAoB,CAAC,MAAM,CAC3C,CAAC;YACF,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;YAC3D,2GAA2G;YAC3G,wBAAwB,CACtB,OAAO,EACP,WAAW,EACX,SAAS,CAAC,OAAO,EACjB,SAAS,EACT,cAAc,CAAC,oBAAoB,CAAC,MAAM,CAC3C,CAAC;YACF,yBAAyB,CAAC,WAAW,CAAC,CAAC;YACvC,WAAW,CAAC,iBAAiB,EAAE,CAAC;YAChC,WAAW,CAAC,oBAAoB,EAAE,CAAC;YACnC,qBAAqB,CAAC,GAAG,CAAC,wBAAwB,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IACD,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;QACpD,IAAI,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnD,KACE,IAAI,KAAK,GAAG,CAAC,EACb,KAAK,GAAG,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,EACtD,KAAK,EAAE,EACP,CAAC;gBACD,MAAM,wBAAwB,GAC5B,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC;oBAC5C,CAAC,CAAC,GAAG,uBAAuB,CACxB,cAAc,EACd,QAAQ,CAAC,IAAI,EACb,GAAG,EACH,KAAK,CACN,QAAQ;oBACX,CAAC,CAAC,0EAA0E;wBAC1E,+DAA+D;wBAC/D,OAAO,CAAC;gBAEd,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;gBACnC,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC;gBACpD,MAAM,WAAW,GACf,MAAA,qBAAqB,CAAC,GAAG,CAAC,wBAAwB,CAAC,mCACnD,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAChC,GAAG,OAAO,IACR,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EACpD,WAAW,wBAAwB,KAAK,CACzC,CAAC;gBACJ,qBAAqB,CACnB,UAAU,EACV,MAAM,EACN,WAAW,EACX,cAAc,EACd,KAAK,CACN,CAAC;gBAEF,sCAAsC;gBACtC,6IAA6I;gBAC7I,YAAY,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;gBACxE,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;gBAClE,2GAA2G;gBAC3G,wBAAwB,CACtB,OAAO,EACP,WAAW,EACX,SAAS,CAAC,OAAO,EACjB,SAAS,EACT,cAAc,CAAC,oBAAoB,CAAC,MAAM,CAC3C,CAAC;gBACF,yBAAyB,CAAC,WAAW,CAAC,CAAC;gBAEvC,WAAW,CAAC,iBAAiB,EAAE,CAAC;gBAChC,WAAW,CAAC,oBAAoB,EAAE,CAAC;gBACnC,qBAAqB,CAAC,GAAG,CAAC,wBAAwB,EAAE,WAAW,CAAC,CAAC;YACnE,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAED,SAAS,UAAU,CACjB,WAAuB,EACvB,MAAc,EACd,gBAAkC,EAClC,cAA8B,EAC9B,QAAgB,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC;IAE9D,MAAM,wBAAwB,GAC5B,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC;QAC5C,CAAC,CAAC,GAAG,uBAAuB,CACxB,cAAc,EACd,QAAQ,CAAC,IAAI,EACb,GAAG,EACH,KAAK,CACN,QAAQ;QACX,CAAC,CAAC,0EAA0E;YAC1E,+DAA+D;YAC/D,OAAO,CAAC;IAEd,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IACnC,MAAM,OAAO,GAAG,gBAAgB,CAAC,cAAc,CAAC,UAAU,CAAC;IAC3D,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,aAAa,CACpD,GAAG,OAAO,IACR,SAAS,IAAI,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EACpD,OAAO,wBAAwB,KAAK,CACrC,CAAC;IAEF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QAC1E,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,WAAW,CAAC,qBAAqB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACtE,OAAO,CAAC;aACL,uBAAuB,EAAE;aACzB,QAAQ,CAAC,UAAU,wBAAwB,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACN,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QAC3C,WAAW,CAAC,oBAAoB,CAAC;YAC/B,eAAe,EAAE,GAAG,KAAK,CAAC,MAAM,CAC9B,cAAc,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,CAC/C,OAAO,wBAAwB,KAAK;YACrC,YAAY,EAAE,QAAQ;SACvB,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
+{"version":3,"file":"buildClassicalOperationGroups.js","sourceRoot":"","sources":["../../../src/modular/buildClassicalOperationGroups.ts"],"names":[],"mappings":"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"}

package/dist/src/modular/buildClientContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildClientContext.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAUpD,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEjE;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,GAC1B,UAAU,CAsHZ"}
+{"version":3,"file":"buildClientContext.d.ts","sourceRoot":"","sources":["../../../src/modular/buildClientContext.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAYpD,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEjE;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,gBAAgB,GAC1B,UAAU,CAkJZ"}

package/dist/src/modular/buildClientContext.js

@@ -1,7 +1,6 @@
-import { getImportSpecifier, NameType, normalizeName } from "@azure-tools/rlc-common";
-import { isRLCMultiEndpoint } from "../utils/clientUtils.js";
+import { getImportSpecifier, isAzurePackage, NameType, normalizeName } from "@azure-tools/rlc-common";
 import { importModels } from "./buildOperations.js";
-import { getUserAgentStatements, getClientParameters, importCredential } from "./helpers/clientHelpers.js";
+import { buildGetClientCredentialParam, buildGetClientEndpointParam, buildGetClientOptionsParam, getClientParameters, importCredential } from "./helpers/clientHelpers.js";
 import { getDocsFromDescription } from "./helpers/docsHelpers.js";
 import { getClientName } from "./helpers/namingHelpers.js";
 import { getType } from "./helpers/typeHelpers.js";
@@ -14,12 +13,16 @@ export function buildClientContext(client, dpgContext, codeModel) {
     const params = getClientParameters(client, dpgContext);
     const srcPath = codeModel.modularOptions.sourceRoot;
     const clientContextFile = codeModel.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}/api/${normalizeName(name, NameType.File)}Context.ts`);
-    let factoryFunction;
     importCredential(codeModel.runtimeImports, clientContextFile);
     importModels(srcPath, clientContextFile, codeModel.project, subfolder);
     clientContextFile.addImportDeclaration({
         moduleSpecifier: getImportSpecifier("restClient", codeModel.runtimeImports),
-        namedImports: ["ClientOptions"]
+        namedImports: ["ClientOptions", "Client", "getClient"]
+    });
+    clientContextFile.addInterface({
+        isExported: true,
+        name: `${client.rlcClientName}`,
+        extends: ["Client"]
     });
     clientContextFile.addInterface({
         name: `${name}ClientOptionalParams`,
@@ -39,64 +42,82 @@ export function buildClientContext(client, dpgContext, codeModel) {
         }),
         docs: ["Optional parameters for the client."]
     });
-    if (isRLCMultiEndpoint(dpgContext)) {
+    // TODO use binder here
+    // (for now) now logger for unbranded pkgs
+    if (isAzurePackage(codeModel)) {
         clientContextFile.addImportDeclaration({
-            moduleSpecifier: `../../rest/${subfolder}/index.js`,
-            namedImports: [`Client`]
-        });
-        clientContextFile.addExportDeclaration({
-            moduleSpecifier: `../../rest/${subfolder}/index.js`,
-            namedExports: [`Client`]
-        });
-        factoryFunction = clientContextFile.addFunction({
-            docs: getDocsFromDescription(description),
-            name: `create${name}`,
-            returnType: `Client.${client.name}`,
-            parameters: params,
-            isExported: true
+            moduleSpecifier: codeModel.clients.length > 1 ? "../../logger.js" : "../logger.js",
+            namedImports: ["logger"]
         });
     }
-    else {
-        const rlcClientName = client.rlcClientName;
+    const factoryFunction = clientContextFile.addFunction({
+        docs: getDocsFromDescription(description),
+        name: `create${name}`,
+        returnType: `${client.rlcClientName}`,
+        parameters: params,
+        isExported: true
+    });
+    const endpointParam = buildGetClientEndpointParam(factoryFunction, client);
+    const credentialParam = buildGetClientCredentialParam(client, codeModel);
+    const optionsParam = buildGetClientOptionsParam(factoryFunction, codeModel, endpointParam);
+    factoryFunction.addStatements(`const clientContext = getClient(${endpointParam}, ${credentialParam}, ${optionsParam});`);
+    const { customHttpAuthHeaderName, customHttpAuthSharedKeyPrefix } = codeModel.options;
+    if (customHttpAuthHeaderName && customHttpAuthSharedKeyPrefix) {
         clientContextFile.addImportDeclaration({
-            moduleSpecifier: `${subfolder && subfolder !== "" ? "../" : ""}../rest/index.js`,
-            namedImports: [`${rlcClientName}`]
-        });
-        clientContextFile.addExportDeclaration({
-            moduleSpecifier: `${subfolder && subfolder !== "" ? "../" : ""}../rest/index.js`,
-            namedExports: [`${rlcClientName}`]
+            moduleSpecifier: getImportSpecifier("coreAuth", codeModel.runtimeImports),
+            namedImports: ["isKeyCredential"]
         });
-        factoryFunction = clientContextFile.addFunction({
-            docs: getDocsFromDescription(description),
-            name: `create${name}`,
-            returnType: `${rlcClientName}`,
-            parameters: params,
-            isExported: true
+        factoryFunction.addStatements(`
+      if(isKeyCredential(credential)) {
+        clientContext.pipeline.addPolicy({ 
+          name: "customKeyCredentialPolicy",
+          sendRequest(request, next) {
+            request.headers.set("${customHttpAuthHeaderName}", "${customHttpAuthSharedKeyPrefix} " + credential.key);
+            return next(request);
+          }
         });
+      }
+      `);
     }
-    const paramNames = params.map((p) => p.name);
-    const { userAgentStatements, updatedParamNames } = getUserAgentStatements("azsdk-js-api", paramNames);
-    factoryFunction.addStatements([
-        userAgentStatements,
-        `const clientContext = getClient(${updatedParamNames});`,
-        `return clientContext;`
-    ]);
-    if (isRLCMultiEndpoint(dpgContext)) {
-        clientContextFile.addImportDeclarations([
-            {
-                moduleSpecifier: `../../rest/${subfolder}/index.js`,
-                namedImports: ["createClient as getClient"]
+    let apiVersionPolicyStatement = `clientContext.pipeline.removePolicy({ name: "ApiVersionPolicy" });`;
+    if (dpgContext.hasApiVersionInClient) {
+        const apiVersionParam = client.parameters.find((x) => x.isApiVersion);
+        if ((apiVersionParam === null || apiVersionParam === void 0 ? void 0 : apiVersionParam.location) === "query") {
+            if (apiVersionParam.clientDefaultValue) {
+                apiVersionPolicyStatement += `const ${apiVersionParam.clientName} = options.${apiVersionParam.clientName} ?? "${apiVersionParam.clientDefaultValue}";`;
             }
-        ]);
+            apiVersionPolicyStatement += `
+      clientContext.pipeline.addPolicy({
+        name: 'ClientApiVersionPolicy',
+        sendRequest: (req, next) => {
+          // Use the apiVersion defined in request url directly
+          // Append one if there is no apiVersion and we have one at client options
+          const url = new URL(req.url);
+          if (!url.searchParams.get("api-version")) {
+            req.url = \`\${req.url}\${
+              Array.from(url.searchParams.keys()).length > 0 ? "&" : "?"
+            }api-version=\${${apiVersionParam.clientName}}\`;
+          }
+    
+          return next(req);
+        },
+      });`;
+        }
+    }
+    else if (isAzurePackage(codeModel)) {
+        apiVersionPolicyStatement += `
+      if (options.apiVersion) {
+        logger.warning("This client does not support client api-version, please change it at the operation level");
+      }`;
     }
     else {
-        clientContextFile.addImportDeclarations([
-            {
-                moduleSpecifier: `${subfolder && subfolder !== "" ? "../" : ""}../rest/index.js`,
-                defaultImport: "getClient"
-            }
-        ]);
+        apiVersionPolicyStatement += `
+      if (options.apiVersion) {
+        console.warn("This client does not support client api-version, please change it at the operation level");
+      }`;
     }
+    factoryFunction.addStatements(apiVersionPolicyStatement);
+    factoryFunction.addStatements("return clientContext;");
     clientContextFile.fixMissingImports({}, { importModuleSpecifierEnding: "js" });
     clientContextFile.fixUnusedIdentifiers();
     return clientContextFile;

package/dist/src/modular/buildClientContext.js.map

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

package/dist/src/modular/buildCodeModel.d.ts

@@ -1,7 +1,7 @@
+import { ModularCodeModel } from "./modularCodeModel.js";
 import { RLCModel } from "@azure-tools/rlc-common";
 import { Project } from "ts-morph";
 import { SdkContext } from "../utils/interfaces.js";
-import { ModularCodeModel } from "./modularCodeModel.js";
 export interface EmitterOptions {
     "basic-setup-py"?: boolean;
     "package-version"?: string;

package/dist/src/modular/buildCodeModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildCodeModel.d.ts","sourceRoot":"","sources":["../../../src/modular/buildCodeModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,QAAQ,EACT,MAAM,yBAAyB,CAAC;AAyEjC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAsBpD,OAAO,EAGL,gBAAgB,EAOjB,MAAM,uBAAuB,CAAC;AAuB/B,MAAM,WAAW,cAAc;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAsqDD,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EACnC,kBAAkB,EAAE,MAAM,EAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE;IAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAA;CAAwB,GAC3D,gBAAgB,CA0DlB"}
+{"version":3,"file":"buildCodeModel.d.ts","sourceRoot":"","sources":["../../../src/modular/buildCodeModel.ts"],"names":[],"mappings":"AAoCA,OAAO,EAKL,gBAAgB,EAKjB,MAAM,uBAAuB,CAAC;AAY/B,OAAO,EAEL,QAAQ,EAKT,MAAM,yBAAyB,CAAC;AA2CjC,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA6BpD,MAAM,WAAW,cAAc;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AA+oDD,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EACnC,kBAAkB,EAAE,MAAM,EAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE;IAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAA;CAAwB,GAC3D,gBAAgB,CA6ClB"}

package/dist/src/modular/buildCodeModel.js

@@ -1,17 +1,18 @@
-import { buildRuntimeImports, getClientName, NameType, normalizeName } from "@azure-tools/rlc-common";
-import { getLroMetadata, getPagedResult } from "@azure-tools/typespec-azure-core";
-import { getAllModels, getClientNamespaceString, getClientType, getDefaultApiVersion, getHttpOperationWithCache, getLibraryName, getSdkBuiltInType, getSdkUnion, getWireName, isApiVersion, listClients, listOperationGroups, listOperationsInOperationGroup } from "@azure-tools/typespec-client-generator-core";
-import { getDiscriminator, getDoc, getEncode, getFriendlyName, getMaxItems, getMaxLength, getMaxValue, getMinItems, getMinLength, getMinValue, getPattern, getPropertyType, getSummary, getVisibility, isErrorModel, isNeverType, isNullType, isNumericType, isStringType, isTemplateDeclarationOrInstance, isType, isVoidType, listServices, UsageFlags } from "@typespec/compiler";
+import { UsageFlags, getDiscriminator, getDoc, getEncode, getFriendlyName, getMaxItems, getMaxLength, getMaxValue, getMinItems, getMinLength, getMinValue, getPattern, getPropertyType, getSummary, getVisibility, isErrorModel, isNeverType, isNullType, isNumericType, isStringType, isTemplateDeclarationOrInstance, isType, isVoidType, listServices } from "@typespec/compiler";
 import { getAuthentication, getServers, isSharedRoute } from "@typespec/http";
-import { getAddedOnVersions } from "@typespec/versioning";
-import { reportDiagnostic } from "../lib.js";
-import { camelToSnakeCase, toCamelCase } from "../utils/casingUtils.js";
+import { NameType, buildRuntimeImports, getClientName, isAzurePackage, normalizeName } from "@azure-tools/rlc-common";
+import { getAllModels, getClientNamespaceString, getClientType, getDefaultApiVersion, getHttpOperationWithCache, getLibraryName, getSdkUnion, getWireName, isApiVersion, listClients, listOperationGroups, listOperationsInOperationGroup } from "@azure-tools/typespec-client-generator-core";
 import { buildCoreTypeInfo, getBodyType, getDefaultApiVersionString, getEffectiveSchemaType, isAzureCoreErrorType, isSchemaProperty } from "../utils/modelUtils.js";
-import { getModelNamespaceName } from "../utils/namespaceUtils.js";
+import { camelToSnakeCase, toCamelCase } from "../utils/casingUtils.js";
 import { extractPagedMetadataNested, getOperationGroupName, getOperationName, isBinaryPayload, isIgnoredHeaderParam, isLongRunningOperation, parseItemName, parseNextLinkName } from "../utils/operationUtil.js";
-import { isModelWithAdditionalProperties } from "./emitModels.js";
+import { getLroMetadata, getPagedResult } from "@azure-tools/typespec-azure-core";
+import { getAddedOnVersions } from "@typespec/versioning";
+import { getModelNamespaceName } from "../utils/namespaceUtils.js";
 import { getType as getTypeName } from "./helpers/typeHelpers.js";
+import { isModelWithAdditionalProperties } from "./emitModels.js";
+import { reportDiagnostic } from "../lib.js";
 import { useContext } from "../contextManager.js";
+import { getSupportedHttpAuth } from "../utils/credentialUtils.js";
 let CASING = "snake";
 function applyCasing(name, options = { casing: "snake" }) {
     if (options.casing === "camel") {
@@ -282,7 +283,7 @@ function emitBodyParameter(context, httpOperation) {
     return undefined;
 }
 function emitParameter(context, parameter, implementation) {
-    var _a;
+    var _a, _b;
     const base = emitParamBase(context, parameter.param);
     let type = getType(context, parameter.param.type, {
         usage: UsageFlags.Input
@@ -321,6 +322,12 @@ function emitParameter(context, parameter, implementation) {
             paramMap.optional = true;
         }
     }
+    if (clientDefaultValue === undefined &&
+        paramMap.location === "endpointPath" &&
+        ((_b = parameter.param.defaultValue) === null || _b === void 0 ? void 0 : _b.valueKind) === "StringValue") {
+        // For endpoint path params, treat the default value as a client default.
+        clientDefaultValue = parameter.param.defaultValue.value;
+    }
     return { clientDefaultValue, ...base, ...paramMap };
 }
 function emitFlattenedParameter(bodyParameter, property) {
@@ -414,8 +421,7 @@ function emitResponse(context, operation, response, innerResponse) {
     }
 }
 function emitOperation(context, operation, operationGroupName, rlcModels, hierarchies) {
-    var _a;
-    const isAzureFlavor = ((_a = rlcModels.options) === null || _a === void 0 ? void 0 : _a.flavor) === "azure";
+    const isAzureFlavor = isAzurePackage(rlcModels);
     const emittedOperation = emitBasicOperation(context, operation, operationGroupName, rlcModels, hierarchies);
     // Skip to extract paging and lro information for non-branded clients.
     if (!isAzureFlavor) {
@@ -883,14 +889,15 @@ function applyEncoding(program, typespecType, target = {}) {
     return target;
 }
 function mergeFormatAndEncoding(format, encoding, encodeAsFormat) {
+    var _a, _b;
     switch (format) {
         case undefined:
-            return encodeAsFormat !== null && encodeAsFormat !== void 0 ? encodeAsFormat : encoding;
+            return (_a = encodeAsFormat !== null && encodeAsFormat !== void 0 ? encodeAsFormat : encoding) !== null && _a !== void 0 ? _a : format;
         case "date-time":
             return encoding;
         case "duration":
         default:
-            return encodeAsFormat !== null && encodeAsFormat !== void 0 ? encodeAsFormat : encoding;
+            return (_b = encodeAsFormat !== null && encodeAsFormat !== void 0 ? encodeAsFormat : encoding) !== null && _b !== void 0 ? _b : format;
     }
 }
 function applyIntrinsicDecorators(program, type, result) {
@@ -1034,7 +1041,7 @@ function emitUnion(context, type, usage) {
             description: sdkType.description || `Type of ${typeName}`,
             internal: true,
             type: sdkType.kind,
-            valueType: emitSimpleType(context, sdkType.valueType),
+            valueType: emitSimpleType(sdkType.valueType),
             values: sdkType.values.map((x) => emitEnumMember(context, x)),
             isFixed: sdkType.isFixed,
             isNonExhaustive: (_c = (_b = context.rlcOptions) === null || _b === void 0 ? void 0 : _b.experimentalExtensibleEnums) !== null && _c !== void 0 ? _c : false,
@@ -1074,17 +1081,10 @@ function emitEnumMember(context, member) {
         isConstant: true
     };
 }
-function emitSimpleType(context, type) {
-    let sdkType;
-    if (type.kind === "Scalar" || type.kind === "Intrinsic") {
-        sdkType = getSdkBuiltInType(context, type);
-    }
-    else {
-        sdkType = type;
-    }
+function emitSimpleType(type) {
     return {
-        nullable: isNullType(sdkType.__raw),
-        type: sdkType.kind === "string" ? "string" : "number", // TODO: handle other types
+        nullable: isNullType(type.__raw),
+        type: type.kind === "string" ? "string" : "number", // TODO: handle other types
         doc: "",
         apiVersions: [],
         sdkDefaultValue: undefined,
@@ -1163,7 +1163,7 @@ function emitOperationGroups(context, client, rlcModels) {
     });
     if (((_f = context.rlcOptions) === null || _f === void 0 ? void 0 : _f.hierarchyClient) === false &&
         ((_g = context.rlcOptions) === null || _g === void 0 ? void 0 : _g.enableOperationGroup)) {
-        resolveConflictIfExist(operationGroups);
+        appendOperationGroupPrefix(operationGroups);
     }
     return operationGroups;
 }
@@ -1188,23 +1188,10 @@ function addHierarchyOperationGroup(operations, groupMapping) {
     }
     return [];
 }
-function resolveConflictIfExist(operationGroups) {
+function appendOperationGroupPrefix(operationGroups) {
     if (operationGroups.length < 2) {
         return;
     }
-    const nameSet = new Set();
-    const hasConflict = operationGroups.some((g) => g.operations.some((op) => {
-        if (nameSet.has(op.name)) {
-            return true;
-        }
-        else {
-            nameSet.add(op.name);
-            return false;
-        }
-    }));
-    if (!hasConflict) {
-        return;
-    }
     // Append operation group prefix
     operationGroups.forEach((g) => g.operations.forEach((op) => {
         op.oriName = op.name;
@@ -1275,14 +1262,12 @@ function emitCredentialParam(context, namespace) {
     const auth = getAuthentication(context.program, namespace);
     if (auth) {
         const credential_types = [];
-        for (const option of auth.options) {
-            for (const scheme of option.schemes) {
-                const type = {
-                    kind: "Credential",
-                    scheme: scheme
-                };
-                credential_types.push(type);
-            }
+        for (const scheme of getSupportedHttpAuth(context.program, auth)) {
+            const type = {
+                kind: "Credential",
+                scheme: scheme
+            };
+            credential_types.push(type);
         }
         if (credential_types.length > 0 &&
             ((_a = context.rlcOptions) === null || _a === void 0 ? void 0 : _a.addCredentials) !== false) {
@@ -1327,17 +1312,14 @@ function getMethodApiVersionParameter() {
         };
     }
 }
-function emitClients(context, namespace, rlcModelsMap) {
+function emitClients(context, rlcModelsMap) {
     var _a;
     const program = context.program;
     const clients = listClients(context);
     const retval = [];
     methodApiVersionParam = undefined;
     for (const client of clients) {
-        const clientName = getLibraryName(context, client.type).replace("Client", "");
-        if (getNamespace(context, client.name) !== namespace) {
-            continue;
-        }
+        const clientName = client.name.replace("Client", "");
         const server = getServerHelper(program, client.service);
         const rlcModels = rlcModelsMap.get(client.service.name);
         if (!rlcModels) {
@@ -1406,7 +1388,6 @@ export function emitCodeModel(dpgContext, rlcModelsMap, modularSourcesRoot, proj
             experimentalExtensibleEnums: !!((_e = dpgContext.rlcOptions) === null || _e === void 0 ? void 0 : _e.experimentalExtensibleEnums)
         },
         namespace: clientNamespaceString,
-        subnamespaceToClients: {},
         clients: [],
         types: [],
         project,
@@ -1420,19 +1401,12 @@ export function emitCodeModel(dpgContext, rlcModelsMap, modularSourcesRoot, proj
     }
     for (const namespace of getNamespaces(dpgContext)) {
         if (namespace === clientNamespaceString) {
-            codeModel.clients = emitClients(dpgContext, namespace, rlcModelsMap);
+            codeModel.clients = emitClients(dpgContext, rlcModelsMap);
             codeModel.clients.length > 1 &&
                 codeModel.clients.map((client) => {
                     client["subfolder"] = normalizeName(client.name.replace("Client", ""), NameType.File);
                 });
         }
-        else {
-            codeModel["subnamespaceToClients"][namespace] = emitClients(dpgContext, namespace, rlcModelsMap);
-            codeModel["subnamespaceToClients"][namespace].length > 1 &&
-                codeModel["subnamespaceToClients"][namespace].map((client) => {
-                    client["subfolder"] = normalizeName(client.name, NameType.File);
-                });
-        }
     }
     codeModel["types"] = [
         { type: "string" },