@azure-tools/typespec-ts 0.55.0-dev.9 → 0.55.1

package/dist/src/transform/transform-telemetry-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform-telemetry-info.js","sourceRoot":"","sources":["../../../src/transform/transform-telemetry-info.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,GAG1B,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,sCAAsC,EAAE,MAAM,4BAA4B,CAAC;AAEpF,MAAM,UAAU,sBAAsB,CACpC,MAAiB,EACjB,UAAsB;IAEtB,MAAM,yBAAyB,GAAG,mCAAmC,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC1F,IAAI,yBAAyB,EAAE,CAAC;QAC9B,OAAO;YACL,yBAAyB;SAC1B,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,mCAAmC,CAAC,UAAsB,EAAE,MAAiB;IACpF,KAAK,MAAM,EAAE,IAAI,4BAA4B,CAAC,MAAM,CAAC,EAAE,CAAC;QACtD,MAAM,UAAU,GAAG,sCAAsC,CACvD,yBAAyB,CAAC,UAAU,EAAE,EAAE,CAAC,CAC1C,CAAC;QACF,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,UAAU,CAAC;QACpB,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"transform-telemetry-info.js","sourceRoot":"","sources":["../../../src/transform/transform-telemetry-info.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,GAG1B,MAAM,6CAA6C,CAAC;AAErD,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,sCAAsC,EAAE,MAAM,4BAA4B,CAAC;AAEpF,MAAM,UAAU,sBAAsB,CACpC,MAAiB,EACjB,UAAsB;IAEtB,MAAM,yBAAyB,GAAG,mCAAmC,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC1F,IAAI,yBAAyB,EAAE,CAAC;QAC9B,OAAO;YACL,yBAAyB;SAC1B,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,mCAAmC,CAAC,UAAsB,EAAE,MAAiB;IACpF,KAAK,MAAM,EAAE,IAAI,yBAAyB,CAAC,MAAM,CAAC,EAAE,CAAC;QACnD,MAAM,UAAU,GAAG,sCAAsC,CACvD,yBAAyB,CAAC,UAAU,EAAE,EAAE,CAAC,CAC1C,CAAC;QACF,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,UAAU,CAAC;QACpB,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

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

@@ -1,6 +1,6 @@
 import { SdkClient } from "@azure-tools/typespec-client-generator-core";
-import { Imports, RLCModel, UrlInfo } from "../rlc-common/index.js";
+import { ClientModel, Imports, UrlInfo } from "../interfaces.js";
 import { SdkContext } from "../utils/interfaces.js";
-export declare function transformRLCModel(client: SdkClient, dpgContext: SdkContext): Promise<RLCModel>;
+export declare function transformClientModel(client: SdkClient, dpgContext: SdkContext): Promise<ClientModel>;
 export declare function transformUrlInfo(client: SdkClient, dpgContext: SdkContext, importDetails: Imports): UrlInfo | undefined;
 //# sourceMappingURL=transform.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/transform/transform.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAC;AAGxE,OAAO,EAEL,OAAO,EAQP,QAAQ,EAIR,OAAO,EACR,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAkBpD,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,QAAQ,CAAC,CAoDnB;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,OAAO,GACrB,OAAO,GAAG,SAAS,CAqFrB"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/transform/transform.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAC;AAGxE,OAAO,EACL,WAAW,EAEX,OAAO,EAOP,OAAO,EACR,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAmBpD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,WAAW,CAAC,CAiDtB;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,OAAO,GACrB,OAAO,GAAG,SAAS,CAqFrB"}

package/dist/src/transform/transform.js

@@ -2,8 +2,10 @@
 // Licensed under the MIT License.
 import { getDoc, joinPaths } from "@typespec/compiler";
 import { getServers } from "@typespec/http";
-import { buildRuntimeImports, initInternalImports, NameType, normalizeName, SchemaContext, } from "../rlc-common/index.js";
+import { SchemaContext, } from "../interfaces.js";
+import { buildRuntimeImports, initInternalImports } from "../utils/imports-util.js";
 import { getDefaultService, getFormattedPropertyDoc, getImportedModelName, getSchemaForType, getTypeName, predictDefaultValue, } from "../utils/model-utils.js";
+import { NameType, normalizeName } from "../utils/name-utils.js";
 import { getClientLroOverload } from "../utils/operation-util.js";
 import { transformApiVersionInfo } from "./transform-api-version-info.js";
 import { transformHelperFunctionDetails } from "./transform-helper-function-details.js";
@@ -12,11 +14,11 @@ import { transformPaths } from "./transform-paths.js";
 import { transformToResponseTypes } from "./transform-responses.js";
 import { transformSchemas } from "./transform-schemas.js";
 import { transformTelemetryInfo } from "./transform-telemetry-info.js";
-export async function transformRLCModel(client, dpgContext) {
+export async function transformClientModel(client, dpgContext) {
     const program = dpgContext.program;
-    const options = dpgContext.rlcOptions;
-    const rlcSourceDir = dpgContext.generationPathDetail?.rlcSourcesDir;
-    const srcPath = joinPaths(dpgContext.generationPathDetail?.rlcSourcesDir ?? "", options.batch && options.batch.length > 1
+    const options = dpgContext.emitterOptions;
+    const sourceDir = dpgContext.generationPathDetail?.sourcesDir;
+    const srcPath = joinPaths(dpgContext.generationPathDetail?.sourcesDir ?? "", options.batch && options.batch.length > 1
         ? normalizeName(client.name.replace("Client", ""), NameType.File)
         : "");
     const libraryName = normalizeName(options.batch ? client.name : (client.name ?? getDefaultService(program)?.title ?? ""), NameType.Class);
@@ -46,11 +48,8 @@ export async function transformRLCModel(client, dpgContext) {
             internalImports: importSet,
             runtimeImports: buildRuntimeImports(),
         },
-        rlcSourceDir,
+        sourceDir,
     };
-    // RLC sample generation has been removed; modular samples are emitted separately,
-    // so the RLC model never carries sample groups.
-    options.generateSample = false;
     return model;
 }
 export function transformUrlInfo(client, dpgContext, importDetails) {
@@ -96,7 +95,7 @@ export function transformUrlInfo(client, dpgContext, importDetails) {
         }
     }
     if (importedModels.size > 0) {
-        importDetails.rlcClientFactory.importsSet = importedModels;
+        importDetails.clientFactory.importsSet = importedModels;
     }
     if (endpoint && urlParameters.length > 0) {
         for (const param of urlParameters) {

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

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

package/dist/src/utils/api-version-util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"api-version-util.d.ts","sourceRoot":"","sources":["../../../src/utils/api-version-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE/E;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS,CAiBnF;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,mBAAmB,CAAC,EAAE,cAAc,EACpC,gBAAgB,CAAC,EAAE,cAAc,GAChC,kBAAkB,CAUpB"}

package/dist/src/utils/api-version-util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"api-version-util.js","sourceRoot":"","sources":["../../../src/utils/api-version-util.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAiB;IACrD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IACD,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,EAAE,MAAM,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,aAAa,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,YAAY,CACvF,CAAC;IACF,IAAI,CAAC,KAAK,IAAI,KAAK,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO;IACT,CAAC;IACD,MAAM,MAAM,GAAmB;QAC7B,eAAe,EAAE,MAAM;QACvB,gBAAgB,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,CAAC;QAC5C,YAAY,EAAE,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAA4B,CAAC,CAAC,CAAC,SAAS;QACtF,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,sBAAsB,CACpC,mBAAoC,EACpC,gBAAiC;IAEjC,IAAI,GAAG,GAAuB,MAAM,CAAC;IACrC,IAAI,mBAAmB,IAAI,gBAAgB,EAAE,CAAC;QAC5C,GAAG,GAAG,WAAW,CAAC;IACpB,CAAC;SAAM,IAAI,mBAAmB,EAAE,eAAe,EAAE,CAAC;QAChD,GAAG,GAAG,mBAAmB,CAAC,eAAgB,CAAC;IAC7C,CAAC;SAAM,IAAI,gBAAgB,EAAE,CAAC;QAC5B,GAAG,GAAG,SAAS,CAAC;IAClB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/src/utils/client-utils.d.ts

@@ -1,10 +1,10 @@
 import { SdkClient, SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
 import { Operation } from "@typespec/compiler";
-import { ModularClientOptions } from "../modular/interfaces.js";
+import { ClientModuleInfo } from "../modular/interfaces.js";
 import { SdkContext } from "./interfaces.js";
-export declare function getRLCClients(dpgContext: SdkContext): SdkClient[];
-export declare function listOperationsUnderRLCClient(client: SdkClient): Operation[];
-export declare function isRLCMultiEndpoint(dpgContext: SdkContext): boolean;
-export declare function getModularClientOptions(clientMap: [string[], SdkClientType<SdkServiceOperation>]): ModularClientOptions;
+export declare function getClients(dpgContext: SdkContext): SdkClient[];
+export declare function listOperationsUnderClient(client: SdkClient): Operation[];
+export declare function isMultiEndpointClient(dpgContext: SdkContext): boolean;
+export declare function getClientModuleInfo(clientMap: [string[], SdkClientType<SdkServiceOperation>]): ClientModuleInfo;
 export declare function getClientHierarchyMap(context: SdkContext): [string[], SdkClientType<SdkServiceOperation>][];
 //# sourceMappingURL=client-utils.d.ts.map

package/dist/src/utils/client-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/client-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,SAAS,EACT,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAML,SAAS,EACV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,wBAAgB,aAAa,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS,EAAE,CA2DjE;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,EAAE,CA6B3E;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAElE;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC,wBAOhG;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,GAClB,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAiClD"}
+{"version":3,"file":"client-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/client-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,SAAS,EACT,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAML,SAAS,EACV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C,wBAAgB,UAAU,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS,EAAE,CA2D9D;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,EAAE,CA6BxE;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAErE;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC,oBAO5F;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,GAClB,CAAC,MAAM,EAAE,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAiClD"}

package/dist/src/utils/client-utils.js

@@ -1,7 +1,7 @@
 import { InitializedByFlags, listAllServiceNamespaces, listClients, } from "@azure-tools/typespec-client-generator-core";
 import { getNamespaceFullName, isTemplateDeclaration, isTemplateDeclarationOrInstance, } from "@typespec/compiler";
-import { NameType, normalizeName } from "../rlc-common/index.js";
-export function getRLCClients(dpgContext) {
+import { NameType, normalizeName } from "./name-utils.js";
+export function getClients(dpgContext) {
     const clients = listClients(dpgContext);
     const rawServiceNamespaces = dpgContext.allServiceNamespaces ?? listAllServiceNamespaces(dpgContext);
     // For one client: Return the client from listClients with multi-service support
@@ -58,7 +58,7 @@ export function getRLCClients(dpgContext) {
         };
     });
 }
-export function listOperationsUnderRLCClient(client) {
+export function listOperationsUnderClient(client) {
     const operations = [];
     const serviceArray = client.services;
     const queue = [...serviceArray];
@@ -77,16 +77,16 @@ export function listOperationsUnderRLCClient(client) {
     }
     return operations;
 }
-export function isRLCMultiEndpoint(dpgContext) {
-    return getRLCClients(dpgContext).length > 1;
+export function isMultiEndpointClient(dpgContext) {
+    return getClients(dpgContext).length > 1;
 }
-export function getModularClientOptions(clientMap) {
+export function getClientModuleInfo(clientMap) {
     const [hierarchy, client] = clientMap;
-    const clientOptions = {
-        rlcClientName: `${client.name.replace(/Client$/, "")}Context`,
+    const clientModuleInfo = {
+        clientName: `${client.name.replace(/Client$/, "")}Context`,
     };
-    clientOptions.subfolder = hierarchy.join("/");
-    return clientOptions;
+    clientModuleInfo.subfolder = hierarchy.join("/");
+    return clientModuleInfo;
 }
 export function getClientHierarchyMap(context) {
     const clientMap = [];

package/dist/src/utils/client-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-utils.js","sourceRoot":"","sources":["../../../src/utils/client-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client-utils.js","sourceRoot":"","sources":["../../../src/utils/client-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,WAAW,GAIZ,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,oBAAoB,EAEpB,qBAAqB,EACrB,+BAA+B,GAGhC,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE1D,MAAM,UAAU,UAAU,CAAC,UAAsB;IAC/C,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IACxC,MAAM,oBAAoB,GACxB,UAAU,CAAC,oBAAoB,IAAI,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAE1E,gFAAgF;IAChF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC5B,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YACjC,OAAO;gBACL,GAAG,MAAM;gBACT,QAAQ,EAAE,QAAQ;gBAClB,yBAAyB,EAAE,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAE,CAAC,IAAI,MAAM,CAAC,IAAI,EAAE;aAClF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,wBAAwB;QACxB,yDAAyD;QACzD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAa,CAAC;QACtC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACpB,MAAM,aAAa,GAAG,CAAC,CAAC,QAAQ,CAAC;YACjC,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,IAAI,QAAQ,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC;gBAC3C,OAAO;oBACL,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,UAAU;oBAChB,OAAO,EAAE,OAAO;oBAChB,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,CAAC,OAAO,CAAC;oBACnB,UAAU,EAAE,EAAE;oBACd,UAAU,EAAE,UAAU;oBACtB,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;oBAC5B,yBAAyB,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,IAAI,UAAU,EAAE;oBAC3E,kBAAkB,EAAE,EAAE;iBACvB,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,yDAAyD;IACzD,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,GAAG,QAAQ,CAAC;QAC3C,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,CAAC,OAAO,CAAC;YACnB,UAAU,EAAE,EAAE;YACd,UAAU,EAAE,UAAU;YACtB,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;YAC5B,yBAAyB,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,IAAI,UAAU,EAAE;YAC3E,kBAAkB,EAAE,EAAE;SACvB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,MAAiB;IACzD,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC;IACrC,MAAM,KAAK,GAA8B,CAAC,GAAG,YAAY,CAAC,CAAC;IAC3D,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;QAC/B,IACE,OAAO,CAAC,UAAU,CAAC,IAAI,CACrB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,UAAU,EAAE,IAAI,KAAK,SAAS;YAChC,oBAAoB,CAAC,CAAC,CAAC,UAAU,EAAE,SAAS,CAAC,KAAK,4BAA4B,CACjF;YACD,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAoB,CAAC,EAC5C,CAAC;YACD,SAAS;QACX,CAAC;QACD,UAAU,CAAC,IAAI,CACb,GAAG,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CACxC,CAAC,EAAE,EAAE,EAAE,CAAC,+BAA+B,CAAC,EAAE,CAAC,KAAK,KAAK,CACtD,CACF,CAAC;QACF,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACjC,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;YAC3C,KAAK,CAAC,IAAI,CACR,GAAG,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CACtF,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,UAAsB;IAC1D,OAAO,UAAU,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,SAAyD;IAC3F,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IACtC,MAAM,gBAAgB,GAAqB;QACzC,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS;KAC3D,CAAC;IACF,gBAAgB,CAAC,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,OAAmB;IAEnB,MAAM,SAAS,GAAqD,EAAE,CAAC;IACvE,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;QACrE,OAAO,MAAM,CAAC,oBAAoB,CAAC,aAAa,GAAG,kBAAkB,CAAC,YAAY,CAAC;IACrF,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC/C,OAAO;YACL,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;gBACnC,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACnE,CAAC,CAAC,EAAE;YACN,MAAM;SACP,CAAC;IACJ,CAAC,CAAqD,CAAC;IACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAE,CAAC;QACxC,SAAS,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;QACpC,MAAM,sBAAsB,GAAG,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/D,OAAO,CACL,KAAK,CAAC,oBAAoB,CAAC,aAAa,GAAG,kBAAkB,CAAC,YAAY;gBAC1E,KAAK,CAAC,oBAAoB,CAAC,aAAa,GAAG,kBAAkB,CAAC,MAAM,CACrE,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,IAAI,sBAAsB,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChE,sBAAsB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACvC,MAAM,cAAc,GAAG;oBACrB,GAAG,SAAS;oBACZ,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC;iBAC/D,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/src/utils/cross-language-def.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cross-language-def.d.ts","sourceRoot":"","sources":["../../../src/utils/cross-language-def.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAG7C,wBAAgB,mCAAmC,CAAC,UAAU,EAAE,UAAU,GAAG;IAC3E,sBAAsB,EAAE,MAAM,CAAC;IAC/B,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnD,CAqDA"}
+{"version":3,"file":"cross-language-def.d.ts","sourceRoot":"","sources":["../../../src/utils/cross-language-def.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,wBAAgB,mCAAmC,CAAC,UAAU,EAAE,UAAU,GAAG;IAC3E,sBAAsB,EAAE,MAAM,CAAC;IAC/B,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnD,CAqDA"}

package/dist/src/utils/cross-language-def.js

@@ -2,10 +2,10 @@
 // Licensed under the MIT License.
 import { UsageFlags } from "@azure-tools/typespec-client-generator-core";
 import { transformModularEmitterOptions } from "../modular/build-modular-options.js";
-import { NameType, normalizeName } from "../rlc-common/index.js";
+import { NameType, normalizeName } from "./name-utils.js";
 import { getMethodHierarchiesMap } from "./operation-util.js";
 export function generateCrossLanguageDefinitionFile(dpgContext) {
-    const modularSourcesRoot = dpgContext.generationPathDetail?.modularSourcesDir ?? "src";
+    const modularSourcesRoot = dpgContext.generationPathDetail?.sourcesDir ?? "src";
     const emitterOptions = transformModularEmitterOptions(dpgContext, modularSourcesRoot, {
         casing: "camel",
     });
@@ -17,7 +17,7 @@ export function generateCrossLanguageDefinitionFile(dpgContext) {
     }
     for (const enm of dpgContext.sdkPackage.enums) {
         // Skip api version enum for multi-service scenarios since each service may have different versions
-        if (dpgContext.rlcOptions?.isMultiService && enm.usage === UsageFlags.ApiVersionEnum) {
+        if (dpgContext.emitterOptions?.isMultiService && enm.usage === UsageFlags.ApiVersionEnum) {
             continue;
         }
         CrossLanguageDefinitionId[`${packageName}!Known${enm.name}:enum`] =

package/dist/src/utils/cross-language-def.js.map

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

package/dist/src/utils/emit-util.d.ts

@@ -1,4 +1,4 @@
 import { Program } from "@typespec/compiler";
-import { ContentBuilder, RLCModel } from "../rlc-common/index.js";
-export declare function emitContentByBuilder(program: Program, builderFnOrList: ContentBuilder | ContentBuilder[], rlcModels: RLCModel, emitterOutputDir?: string): Promise<void>;
+import { ClientModel, ContentBuilder } from "../interfaces.js";
+export declare function emitContentByBuilder(program: Program, builderFnOrList: ContentBuilder | ContentBuilder[], clientModels: ClientModel, emitterOutputDir?: string): Promise<void>;
 //# sourceMappingURL=emit-util.d.ts.map

package/dist/src/utils/emit-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emit-util.d.ts","sourceRoot":"","sources":["../../../src/utils/emit-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAMlG,OAAO,EAAE,cAAc,EAAQ,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAExE,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,cAAc,GAAG,cAAc,EAAE,EAClD,SAAS,EAAE,QAAQ,EACnB,gBAAgB,CAAC,EAAE,MAAM,iBAiB1B"}
+{"version":3,"file":"emit-util.d.ts","sourceRoot":"","sources":["../../../src/utils/emit-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuD,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAKlG,OAAO,EAAE,WAAW,EAAE,cAAc,EAAQ,MAAM,kBAAkB,CAAC;AAGrE,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,cAAc,GAAG,cAAc,EAAE,EAClD,YAAY,EAAE,WAAW,EACzB,gBAAgB,CAAC,EAAE,MAAM,iBAiB1B"}

package/dist/src/utils/emit-util.js

@@ -4,12 +4,12 @@ import prettierPluginBabel from "prettier/plugins/babel";
 import prettierPluginEstree from "prettier/plugins/estree";
 import prettierPluginTypescript from "prettier/plugins/typescript";
 import { prettierJSONOptions, prettierTypeScriptOptions, reportDiagnostic } from "../lib.js";
-export async function emitContentByBuilder(program, builderFnOrList, rlcModels, emitterOutputDir) {
+export async function emitContentByBuilder(program, builderFnOrList, clientModels, emitterOutputDir) {
     if (!Array.isArray(builderFnOrList)) {
         builderFnOrList = [builderFnOrList];
     }
     for (const builderFn of builderFnOrList) {
-        let contentFiles = builderFn(rlcModels);
+        let contentFiles = builderFn(clientModels);
         if (!contentFiles) {
             continue;
         }

package/dist/src/utils/emit-util.js.map

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

package/dist/src/utils/imports-util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"imports-util.d.ts","sourceRoot":"","sources":["../../../src/utils/imports-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEvD;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CA0C7C;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CA+B7C;AAED,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,UAAU,EACtB,OAAO,CAAC,EAAE,OAAO,EACjB,eAAe,UAAO,GACrB,MAAM,CAkBR;AAED,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,OAAO,EACvB,YAAY,EAAE,MAAM,GACnB,IAAI,CAYN;AAED,wBAAgB,eAAe,CAAC,cAAc,EAAE,OAAO,GAAG,IAAI,CAI7D;AAED,wBAAgB,iBAAiB,CAC/B,cAAc,EAAE,OAAO,EACvB,IAAI,EAAE,UAAU,EAChB,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC5C,IAAI,CA+BN"}

package/dist/src/{rlc-common/helpers → utils}/imports-util.js

@@ -59,20 +59,20 @@ export function initInternalImports() {
             type: "response",
             importsSet: new Set(),
         },
-        rlcIndex: {
-            type: "rlcIndex",
+        index: {
+            type: "index",
             importsSet: new Set(),
         },
         modularModel: {
             type: "modularModel",
             importsSet: new Set(),
         },
-        rlcClientFactory: {
-            type: "rlcClientFactory",
+        clientFactory: {
+            type: "clientFactory",
             importsSet: new Set(),
         },
-        rlcClientDefinition: {
-            type: "rlcClientDefinition",
+        clientDefinition: {
+            type: "clientDefinition",
             importsSet: new Set(),
         },
         serializerHelpers: {

package/dist/src/utils/imports-util.js.map

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

package/dist/src/utils/interfaces.d.ts

@@ -1,17 +1,16 @@
 import { SdkContext as TCGCSdkContext } from "@azure-tools/typespec-client-generator-core";
 import { ModelProperty, Namespace } from "@typespec/compiler";
-import { RLCOptions, SchemaContext } from "../rlc-common/index.js";
+import { ClientOptions, SchemaContext } from "../interfaces.js";
 import { KnownMediaType } from "./media-types.js";
 export interface SdkContext extends TCGCSdkContext {
-    rlcOptions?: RLCOptions;
+    emitterOptions?: ClientOptions;
     generationPathDetail?: GenerationDirDetail;
     hasApiVersionInClient?: boolean;
     allServiceNamespaces?: Namespace[];
 }
 export interface GenerationDirDetail {
     rootDir: string;
-    rlcSourcesDir: string;
-    modularSourcesDir?: string;
+    sourcesDir: string;
     metadataDir: string;
 }
 export interface GetSchemaOptions {

package/dist/src/utils/interfaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/utils/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,WAAW,UAAW,SAAQ,cAAc;IAChD,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,oBAAoB,CAAC,EAAE,mBAAmB,CAAC;IAC3C,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAE/B,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IAGxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,gBAAgB,CAAC,EAAE,aAAa,CAAC;IAEjC,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;IAE9B,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B"}
+{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/utils/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,WAAW,UAAW,SAAQ,cAAc;IAChD,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,oBAAoB,CAAC,EAAE,mBAAmB,CAAC;IAC3C,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAE/B,KAAK,CAAC,EAAE,aAAa,EAAE,CAAC;IAGxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,gBAAgB,CAAC,EAAE,aAAa,CAAC;IAEjC,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;IAE9B,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B"}

package/dist/src/utils/model-utils.d.ts

@@ -1,7 +1,7 @@
 import { Model, ModelProperty, Program, Service, Type, Union, Value } from "@typespec/compiler";
 import { HttpOperation, HttpOperationHeaderParameter, HttpOperationParameters, HttpOperationPathParameter, HttpOperationQueryParameter } from "@typespec/http";
-import { ObjectSchema, Schema, SchemaContext } from "../rlc-common/index.js";
 import { GetSchemaOptions, SdkContext } from "./interfaces.js";
+import { ObjectSchema, Schema, SchemaContext } from "../interfaces.js";
 export declare const BINARY_TYPE_UNION = "string | Uint8Array | ReadableStream<Uint8Array> | NodeReadableStream";
 export declare const BINARY_AND_FILE_TYPE_UNION = "string | Uint8Array | ReadableStream<Uint8Array> | NodeReadableStream | File";
 export declare function getBinaryType(usage: SchemaContext[]): "string | Uint8Array | ReadableStream<Uint8Array> | NodeReadableStream" | "Uint8Array";

package/dist/src/utils/model-utils.d.ts.map

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

package/dist/src/utils/model-utils.js

@@ -4,10 +4,12 @@ import { getUnionAsEnum } from "@azure-tools/typespec-azure-core";
 import { getDefaultApiVersion, getWireName, isApiVersion, } from "@azure-tools/typespec-client-generator-core";
 import { NoTarget, getDiscriminator, getDoc, getEffectiveModelType, getEncode, getFormat, getFriendlyName, getLifecycleVisibilityEnum, getMaxLength, getMaxValue, getMinLength, getMinValue, getPattern, getProperty, getPropertyType, getSummary, getVisibilityForClass, isArrayModelType, isNeverType, isNullType, isNumericType, isRecordModelType, isSecret, isStringType, isTemplateDeclaration, isUnknownType, listServices, } from "@typespec/compiler";
 import { Visibility, getHeaderFieldName, getHttpFileModel, getHttpPart, getPathParamName, getQueryParamName, isBody, isStatusCode, } from "@typespec/http";
-import { NameType, SchemaContext, isArraySchema, normalizeName, } from "../rlc-common/index.js";
 import { KnownMediaType, hasMediaType, isMediaTypeMultipartFormData } from "./media-types.js";
+import { SchemaContext, } from "../interfaces.js";
 import { reportDiagnostic } from "../lib.js";
+import { NameType, normalizeName } from "./name-utils.js";
 import { getModelNamespaceName } from "./namespace-utils.js";
+import { isArraySchema } from "./schema-helpers.js";
 export const BINARY_TYPE_UNION = "string | Uint8Array | ReadableStream<Uint8Array> | NodeReadableStream";
 export const BINARY_AND_FILE_TYPE_UNION = `${BINARY_TYPE_UNION} | File`;
 export function getBinaryType(usage) {
@@ -704,7 +706,7 @@ function getModelName(dpgContext, model) {
         fullNamespacePrefix = "";
     }
     // 5. check if this model should be namespaced
-    return dpgContext.rlcOptions?.enableModelNamespace ? `${fullNamespacePrefix}${name}` : name;
+    return dpgContext.emitterOptions?.enableModelNamespace ? `${fullNamespacePrefix}${name}` : name;
 }
 // Map an typespec type to an OA schema. Returns undefined when the resulting
 // OA schema is just a regular object schema.