@azure-tools/typespec-ts 0.36.0 → 0.37.0

package/dist/src/modular/buildOperations.js

@@ -1,26 +1,28 @@
-import { NameType, clearImportSets, normalizeName } from "@azure-tools/rlc-common";
+import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import { getDeserializePrivateFunction, getExpectedStatuses, getOperationFunction, getOperationOptionsName, getSendPrivateFunction, isLroOnlyOperation } from "./helpers/operationHelpers.js";
 import { addImportBySymbol } from "../utils/importHelper.js";
 import { getDocsFromDescription } from "./helpers/docsHelpers.js";
 import { getOperationName } from "./helpers/namingHelpers.js";
-import { isRLCMultiEndpoint } from "../utils/clientUtils.js";
+import { getModularClientOptions, isRLCMultiEndpoint } from "../utils/clientUtils.js";
 import { getTypeExpression } from "./type-expressions/get-type-expression.js";
-import { buildType } from "./helpers/typeHelpers.js";
+import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
+import { resolveReference } from "../framework/reference.js";
+import { useDependencies } from "../framework/hooks/useDependencies.js";
 /**
  * This function creates a file under /api for each operation group.
  * If there is no operation group in the TypeSpec program, we create a single
  * file called operations.ts where all operations are generated.
  */
-export function buildOperationFiles(client, dpgContext, codeModel) {
-    const operationFiles = [];
+export function buildOperationFiles(dpgContext, client, emitterOptions) {
+    const operationFiles = new Set();
+    const { subfolder, rlcClientName } = getModularClientOptions(dpgContext, client);
     const isMultiEndpoint = isRLCMultiEndpoint(dpgContext);
-    const clientType = isMultiEndpoint
-        ? `Client.${client.rlcClientName}`
-        : "Client";
-    for (const operationGroup of client.operationGroups) {
-        clearImportSets(codeModel.runtimeImports);
-        const operationFileName = operationGroup.className && operationGroup.namespaceHierarchies.length > 0
-            ? `${operationGroup.namespaceHierarchies
+    const clientType = isMultiEndpoint ? `Client.${rlcClientName}` : "Client";
+    const methodMap = getMethodHierarchiesMap(dpgContext, client);
+    for (const [prefixKey, operations] of methodMap) {
+        const prefixes = prefixKey.split("/");
+        const operationFileName = prefixes.length > 0 && prefixKey !== ""
+            ? `${prefixes
                 .map((hierarchy) => {
                 return normalizeName(hierarchy, NameType.File);
             })
@@ -28,34 +30,33 @@ export function buildOperationFiles(client, dpgContext, codeModel) {
             : // When the program has no operation groups defined all operations are put
                 // into a nameless operation group. We'll call this operations.
                 "operations";
-        const subfolder = client.subfolder;
-        const srcPath = codeModel.modularOptions.sourceRoot;
-        const operationGroupFile = codeModel.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}api/${operationFileName}.ts`);
+        const srcPath = emitterOptions.modularOptions.sourceRoot;
+        const filepath = `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}api/${operationFileName}.ts`;
+        const operationGroupFile = emitterOptions.project.createSourceFile(filepath);
         // Import the deserializeUtils
-        importDeserializeUtils(srcPath, operationGroupFile, codeModel.project, "deserialize", subfolder, operationGroup.namespaceHierarchies.length);
+        importDeserializeUtils(srcPath, operationGroupFile, emitterOptions.project, "deserialize", subfolder, prefixes.length);
         // Import the serializeUtils
-        importDeserializeUtils(srcPath, operationGroupFile, codeModel.project, "serialize", subfolder, operationGroup.namespaceHierarchies.length);
-        const indexPathPrefix = "../".repeat(operationGroup.namespaceHierarchies.length) || "./";
-        operationGroupFile.addImportDeclaration({
-            namedImports: [`${client.rlcClientName} as Client`],
-            moduleSpecifier: `${indexPathPrefix}index.js`
-        });
-        operationGroup.operations.forEach((o) => {
-            const operationDeclaration = getOperationFunction(dpgContext, o, clientType);
-            const sendOperationDeclaration = getSendPrivateFunction(dpgContext, o, clientType);
-            const deserializeOperationDeclaration = getDeserializePrivateFunction(dpgContext, o);
+        importDeserializeUtils(srcPath, operationGroupFile, emitterOptions.project, "serialize", subfolder, prefixes.length);
+        operations.forEach((op) => {
+            const operationDeclaration = getOperationFunction(dpgContext, [prefixes, op], clientType);
+            const sendOperationDeclaration = getSendPrivateFunction(dpgContext, client, [prefixes, op], clientType);
+            const deserializeOperationDeclaration = getDeserializePrivateFunction(dpgContext, op);
             operationGroupFile.addFunctions([
                 sendOperationDeclaration,
                 deserializeOperationDeclaration,
                 operationDeclaration
             ]);
         });
-        // addImportsToFiles(codeModel.runtimeImports, operationGroupFile);
-        operationGroupFile.fixUnusedIdentifiers();
+        const indexPathPrefix = "../".repeat(prefixKey === "" ? 0 : prefixes.length) || "./";
+        operationGroupFile.addImportDeclaration({
+            namedImports: [`${rlcClientName} as Client`],
+            moduleSpecifier: `${indexPathPrefix}index.js`
+        });
         addImportBySymbol("serializeRecord", operationGroupFile);
-        operationFiles.push(operationGroupFile);
+        operationGroupFile.fixUnusedIdentifiers();
+        operationFiles.add(operationGroupFile);
     }
-    return operationFiles;
+    return Array.from(operationFiles);
 }
 export function importDeserializeUtils(srcPath, sourceFile, project, serializeType, subfolder = "", importLayer = 0) {
     var _a;
@@ -77,13 +78,16 @@ export function importDeserializeUtils(srcPath, sourceFile, project, serializeTy
 /**
  * This function generates the interfaces for each operation options
  */
-export function buildOperationOptions(context, operation, sourceFile) {
-    var _a;
+export function buildOperationOptions(context, method, sourceFile) {
+    const dependencies = useDependencies();
+    const operation = method[1];
     const optionalParameters = operation.parameters
-        .filter((p) => p.implementation === "Method")
+        .filter((p) => p.onClient === false &&
+        !(p.isGeneratedName &&
+            (p.name === "contentType" || p.name !== "accept")))
         .filter((p) => p.optional || p.clientDefaultValue);
     const options = [...optionalParameters];
-    const name = getOperationOptionsName(operation, true);
+    const name = getOperationOptionsName(method, true);
     const lroOptions = {
         name: "updateIntervalInMs",
         type: "number",
@@ -91,25 +95,20 @@ export function buildOperationOptions(context, operation, sourceFile) {
         docs: ["Delay to wait until next poll, in milliseconds."]
     };
     // handle optional body parameter
-    if (((_a = operation.bodyParameter) === null || _a === void 0 ? void 0 : _a.optional) === true) {
-        options.push(operation.bodyParameter);
-    }
+    // if (operation.operation.bodyParam?.optional === true) {
+    //   options.push(operation.operation.bodyParam);
+    // }
+    const operationOptionsReference = resolveReference(dependencies.OperationOptions);
     sourceFile.addInterface({
         name,
         isExported: true,
-        extends: ["OperationOptions"],
+        extends: [operationOptionsReference],
         properties: (isLroOnlyOperation(operation) ? [lroOptions] : []).concat(options.map((p) => {
             return {
-                docs: getDocsFromDescription(p.description),
+                docs: getDocsFromDescription(p.doc),
                 hasQuestionToken: true,
-                ...(p.type.tcgcType
-                    ? {
-                        type: getTypeExpression(context, p.type.tcgcType),
-                        name: p.clientName
-                    }
-                    : {
-                        ...buildType(p.clientName, p.type, p.format)
-                    })
+                type: getTypeExpression(context, p.type),
+                name: normalizeName(p.name, NameType.Parameter)
             };
         })),
         docs: [`Optional parameters.`]
@@ -118,17 +117,19 @@ export function buildOperationOptions(context, operation, sourceFile) {
 /**
  * This function creates a map of operation file path to operation names.
  */
-export function buildLroDeserDetailMap(client) {
+export function buildLroDeserDetailMap(context, client) {
     const map = new Map();
     const existingNames = new Set();
-    for (const operationGroup of client.operationGroups) {
-        const operations = operationGroup.operations.filter((o) => isLroOnlyOperation(o));
+    const methodMap = getMethodHierarchiesMap(context, client);
+    for (const [prefixKey, operations] of methodMap) {
+        const prefixes = prefixKey.split("/");
+        const lroOperations = operations.filter((o) => isLroOnlyOperation(o));
         // skip this operation group if it has no LRO operations
-        if (operations.length === 0) {
+        if (lroOperations.length === 0) {
             continue;
         }
-        const operationFileName = operationGroup.className && operationGroup.namespaceHierarchies.length > 0
-            ? `${operationGroup.namespaceHierarchies
+        const operationFileName = prefixes.length > 0 && prefixKey !== ""
+            ? `${prefixes
                 .map((hierarchy) => {
                 return normalizeName(hierarchy, NameType.File);
             })
@@ -136,7 +137,7 @@ export function buildLroDeserDetailMap(client) {
             : // When the program has no operation groups defined all operations are put
                 // into a nameless operation group. We'll call this operations.
                 "operations";
-        map.set(`./api/${operationFileName}.js`, operations.map((o) => {
+        map.set(`./api/${operationFileName}.js`, lroOperations.map((o) => {
             const { name } = getOperationName(o);
             const deserName = `_${name}Deserialize`;
             let renamedDeserName = undefined;
@@ -149,7 +150,7 @@ export function buildLroDeserDetailMap(client) {
             }
             existingNames.add(deserName);
             return {
-                path: `${o.method.toUpperCase()} ${o.url}`,
+                path: `${o.operation.verb.toUpperCase()} ${o.operation.path}`,
                 expectedStatusesExpression: getExpectedStatuses(o),
                 deserName,
                 renamedDeserName

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

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

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

@@ -1,3 +1,4 @@
-import { ModularCodeModel } from "./modularCodeModel.js";
-export declare function getModuleExports(codeModel: ModularCodeModel): any;
+import { ModularEmitterOptions } from "./interfaces.js";
+import { SdkContext } from "@azure-tools/typespec-client-generator-core";
+export declare function getModuleExports(context: SdkContext, emitterOptions: ModularEmitterOptions): any;
 //# sourceMappingURL=buildProjectFiles.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"buildProjectFiles.d.ts","sourceRoot":"","sources":["../../../src/modular/buildProjectFiles.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAgDzD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,gBAAgB,OAY3D"}
+{"version":3,"file":"buildProjectFiles.d.ts","sourceRoot":"","sources":["../../../src/modular/buildProjectFiles.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AA8CzE,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,UAAU,EACnB,cAAc,EAAE,qBAAqB,OAatC"}

package/dist/src/modular/buildProjectFiles.js

@@ -1,11 +1,13 @@
-import { NameType, normalizeName } from "@azure-tools/rlc-common";
+import { NameType } from "@azure-tools/rlc-common";
 import { getClassicalLayerPrefix } from "./helpers/namingHelpers.js";
-function buildExportsForMultiClient(codeModel, packageInfo) {
-    if (codeModel.clients.length > 1) {
+import { getModularClientOptions } from "../utils/clientUtils.js";
+import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
+function buildExportsForMultiClient(context, emitterOptions, packageInfo) {
+    if (context.sdkPackage.clients.length > 1) {
         delete packageInfo.exports["./api"];
         delete packageInfo.exports["./models"];
-        for (const client of codeModel.clients) {
-            const subfolder = normalizeName(client.name.replace("Client", ""), NameType.File);
+        for (const client of context.sdkPackage.clients) {
+            const { subfolder } = getModularClientOptions(context, client);
             packageInfo.exports[`./${subfolder}`] = `./src/${subfolder}/index.ts`;
             packageInfo.exports[`./${subfolder}/api`] =
                 `./src/${subfolder}/api/index.ts`;
@@ -13,32 +15,32 @@ function buildExportsForMultiClient(codeModel, packageInfo) {
                 `./src/${subfolder}/models/index.ts`;
         }
     }
-    if (codeModel.options.hierarchyClient) {
-        for (const client of codeModel.clients) {
-            for (const operationGroup of client.operationGroups) {
-                if (operationGroup.namespaceHierarchies.length === 0) {
+    if (emitterOptions.options.hierarchyClient) {
+        for (const client of context.sdkPackage.clients) {
+            const { subfolder } = getModularClientOptions(context, client);
+            const methodMap = getMethodHierarchiesMap(context, client);
+            for (const [prefixKey, _] of methodMap) {
+                const prefixes = prefixKey.split("/");
+                if (prefixKey === "") {
                     continue;
                 }
-                const subfolder = codeModel.clients.length > 1
-                    ? normalizeName(client.name.replace("Client", ""), NameType.File)
-                    : undefined;
-                const subApiPath = `api/${getClassicalLayerPrefix(operationGroup, NameType.File, "/")}`;
+                const subApiPath = `api/${getClassicalLayerPrefix(prefixes, NameType.File, "/")}`;
                 packageInfo.exports[`./${subfolder ? subfolder + "/" : ""}${subApiPath}`] = `src/${subfolder ? subfolder + "/" : ""}${subApiPath}/index.ts`;
             }
         }
     }
     return packageInfo.exports;
 }
-export function getModuleExports(codeModel) {
+export function getModuleExports(context, emitterOptions) {
     const exports = {
         exports: {
             ".": "./src/index.ts",
             "./models": "./src/models/index.ts"
         }
     };
-    if (!codeModel.options.azureArm) {
+    if (!emitterOptions.options.azureArm) {
         exports["exports"]["./api"] = "./src/api/index.ts";
     }
-    return buildExportsForMultiClient(codeModel, exports);
+    return buildExportsForMultiClient(context, emitterOptions, exports);
 }
 //# sourceMappingURL=buildProjectFiles.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"buildProjectFiles.js","sourceRoot":"","sources":["../../../src/modular/buildProjectFiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGlE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,SAAS,0BAA0B,CACjC,SAA2B,EAC3B,WAAgB;IAEhB,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,OAAO,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpC,OAAO,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACvC,KAAK,MAAM,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,MAAM,SAAS,GAAG,aAAa,CAC7B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EACjC,QAAQ,CAAC,IAAI,CACd,CAAC;YACF,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,EAAE,CAAC,GAAG,SAAS,SAAS,WAAW,CAAC;YAEtE,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,MAAM,CAAC;gBACvC,SAAS,SAAS,eAAe,CAAC;YACpC,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,SAAS,CAAC;gBAC1C,SAAS,SAAS,kBAAkB,CAAC;QACzC,CAAC;IACH,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QACtC,KAAK,MAAM,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;YACvC,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;gBACpD,IAAI,cAAc,CAAC,oBAAoB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACrD,SAAS;gBACX,CAAC;gBACD,MAAM,SAAS,GACb,SAAS,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;oBAC1B,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC;oBACjE,CAAC,CAAC,SAAS,CAAC;gBAChB,MAAM,UAAU,GAAG,OAAO,uBAAuB,CAC/C,cAAc,EACd,QAAQ,CAAC,IAAI,EACb,GAAG,CACJ,EAAE,CAAC;gBACJ,WAAW,CAAC,OAAO,CACjB,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,CACrD,GAAG,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,WAAW,CAAC;YACtE,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC,OAAO,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,SAA2B;IAC1D,MAAM,OAAO,GAAwB;QACnC,OAAO,EAAE;YACP,GAAG,EAAE,gBAAgB;YACrB,UAAU,EAAE,uBAAuB;SACpC;KACF,CAAC;IACF,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAChC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC;IACrD,CAAC;IAED,OAAO,0BAA0B,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AACxD,CAAC"}
+{"version":3,"file":"buildProjectFiles.js","sourceRoot":"","sources":["../../../src/modular/buildProjectFiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAGnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,SAAS,0BAA0B,CACjC,OAAmB,EACnB,cAAqC,EACrC,WAAgB;IAEhB,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1C,OAAO,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpC,OAAO,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACvC,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YAChD,MAAM,EAAE,SAAS,EAAE,GAAG,uBAAuB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC/D,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,EAAE,CAAC,GAAG,SAAS,SAAS,WAAW,CAAC;YAEtE,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,MAAM,CAAC;gBACvC,SAAS,SAAS,eAAe,CAAC;YACpC,WAAW,CAAC,OAAO,CAAC,KAAK,SAAS,SAAS,CAAC;gBAC1C,SAAS,SAAS,kBAAkB,CAAC;QACzC,CAAC;IACH,CAAC;IACD,IAAI,cAAc,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QAC3C,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YAChD,MAAM,EAAE,SAAS,EAAE,GAAG,uBAAuB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC/D,MAAM,SAAS,GAAG,uBAAuB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC3D,KAAK,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC;gBACvC,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACtC,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;oBACrB,SAAS;gBACX,CAAC;gBACD,MAAM,UAAU,GAAG,OAAO,uBAAuB,CAC/C,QAAQ,EACR,QAAQ,CAAC,IAAI,EACb,GAAG,CACJ,EAAE,CAAC;gBACJ,WAAW,CAAC,OAAO,CACjB,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,CACrD,GAAG,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,WAAW,CAAC;YACtE,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC,OAAO,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,OAAmB,EACnB,cAAqC;IAErC,MAAM,OAAO,GAAwB;QACnC,OAAO,EAAE;YACP,GAAG,EAAE,gBAAgB;YACrB,UAAU,EAAE,uBAAuB;SACpC;KACF,CAAC;IACF,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC;IACrD,CAAC;IAED,OAAO,0BAA0B,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;AACtE,CAAC"}

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

@@ -1,3 +1,5 @@
-import { ModularCodeModel, Client } from "./modularCodeModel.js";
-export declare function buildRestorePoller(codeModel: ModularCodeModel, client: Client): void;
+import { ModularEmitterOptions } from "./interfaces.js";
+import { SdkClientType, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
+import { SdkContext } from "../utils/interfaces.js";
+export declare function buildRestorePoller(context: SdkContext, client: SdkClientType<SdkServiceOperation>, emitterOptions: ModularEmitterOptions): void;
 //# sourceMappingURL=buildRestorePoller.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"buildRestorePoller.d.ts","sourceRoot":"","sources":["../../../src/modular/buildRestorePoller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAYjE,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,gBAAgB,EAC3B,MAAM,EAAE,MAAM,QA2Lf"}
+{"version":3,"file":"buildRestorePoller.d.ts","sourceRoot":"","sources":["../../../src/modular/buildRestorePoller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAQxD,OAAO,EACL,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGpD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,cAAc,EAAE,qBAAqB,QAiMtC"}

package/dist/src/modular/buildRestorePoller.js

@@ -4,28 +4,32 @@ import { buildLroDeserDetailMap } from "./buildOperations.js";
 import { getClientName } from "./helpers/namingHelpers.js";
 import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import { resolveReference } from "../framework/reference.js";
-import { AzureCoreDependencies, AzurePollingDependencies } from "./external-dependencies.js";
+import { AzurePollingDependencies } from "./external-dependencies.js";
 import { PollingHelpers } from "./static-helpers-metadata.js";
-export function buildRestorePoller(codeModel, client) {
-    var _a;
-    const lros = client.operationGroups
-        .flatMap((op) => op.operations)
-        .filter(isLroOnlyOperation);
-    if (lros.length === 0) {
+import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
+import { getModularClientOptions } from "../utils/clientUtils.js";
+import { useDependencies } from "../framework/hooks/useDependencies.js";
+export function buildRestorePoller(context, client, emitterOptions) {
+    const dependencies = useDependencies();
+    const { subfolder } = getModularClientOptions(context, client);
+    const methodMap = getMethodHierarchiesMap(context, client);
+    const hasLro = Array.from(methodMap.values()).some((operations) => {
+        return operations.some(isLroOnlyOperation);
+    });
+    if (!hasLro) {
         return;
     }
-    const srcPath = codeModel.modularOptions.sourceRoot;
-    const subfolder = (_a = client.subfolder) !== null && _a !== void 0 ? _a : "";
-    const filePath = path.join(`${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}restorePollerHelpers.ts`);
-    const restorePollerFile = codeModel.project.createSourceFile(filePath, undefined, {
+    const srcPath = emitterOptions.modularOptions.sourceRoot;
+    const filePath = path.join(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}restorePollerHelpers.ts`);
+    const restorePollerFile = emitterOptions.project.createSourceFile(filePath, undefined, {
         overwrite: true
     });
     const clientNames = importClassicalClient(client, restorePollerFile);
-    const deserializeMap = importDeserializeHelpers(client, restorePollerFile);
-    const pathUncheckedReference = resolveReference(AzureCoreDependencies.PathUncheckedResponse);
+    const deserializeMap = importDeserializeHelpers(context, client, restorePollerFile);
+    const pathUncheckedReference = resolveReference(dependencies.PathUncheckedResponse);
     const pollerLikeReference = resolveReference(AzurePollingDependencies.PollerLike);
     const operationStateReference = resolveReference(AzurePollingDependencies.OperationState);
-    const operationOptionsReference = resolveReference(AzureCoreDependencies.OperationOptions);
+    const operationOptionsReference = resolveReference(dependencies.OperationOptions);
     const deserializeStateReference = resolveReference(AzurePollingDependencies.DeserializeState);
     const restorePollerHelperContent = `
     export interface RestorePollerOptions<
@@ -37,7 +41,7 @@ export function buildRestorePoller(codeModel, client) {
       /**
        * The signal which can be used to abort requests.
       */
-      abortSignal?: ${resolveReference(AzureCoreDependencies.AbortSignalLike)};
+      abortSignal?: ${resolveReference(dependencies.AbortSignalLike)};
       /** Deserialization function for raw response body */
       processResponseBody?: (result: TResponse) => Promise<TResult>;
     }
@@ -175,8 +179,8 @@ export function buildRestorePoller(codeModel, client) {
   `;
     restorePollerFile.addStatements(restorePollerHelperContent);
 }
-function importDeserializeHelpers(client, sourceFile) {
-    const deserializeDetails = buildLroDeserDetailMap(client);
+function importDeserializeHelpers(context, client, sourceFile) {
+    const deserializeDetails = buildLroDeserDetailMap(context, client);
     const deserializeMap = [];
     for (const [key, value] of deserializeDetails.entries()) {
         sourceFile.addImportDeclaration({
@@ -193,7 +197,7 @@ function importDeserializeHelpers(client, sourceFile) {
     return deserializeMap;
 }
 function importClassicalClient(client, sourceFile) {
-    const classicalClientName = `${getClientName(client.tcgcClient)}Client`;
+    const classicalClientName = `${getClientName(client)}Client`;
     sourceFile.addImportDeclaration({
         namedImports: [`${classicalClientName}`],
         moduleSpecifier: `./${normalizeName(classicalClientName, NameType.File)}.js`

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

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

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

@@ -1,10 +1,11 @@
 import { SourceFile } from "ts-morph";
-import { Client, ModularCodeModel } from "./modularCodeModel.js";
-export declare function buildRootIndex(client: Client, codeModel: ModularCodeModel, rootIndexFile: SourceFile): void;
+import { ModularEmitterOptions } from "./interfaces.js";
+import { SdkClientType, SdkContext, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
+export declare function buildRootIndex(context: SdkContext, client: SdkClientType<SdkServiceOperation>, emitterOptions: ModularEmitterOptions, rootIndexFile: SourceFile): void;
 export interface ExportModulesOptions {
     interfaceOnly?: boolean;
     isTopLevel?: boolean;
     subfolder?: string;
 }
-export declare function buildSubClientIndexFile(client: Client, codeModel: ModularCodeModel): void;
+export declare function buildSubClientIndexFile(context: SdkContext, client: SdkClientType<SdkServiceOperation>, emitterOptions: ModularEmitterOptions): void;
 //# sourceMappingURL=buildRootIndex.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"buildRootIndex.d.ts","sourceRoot":"","sources":["../../../src/modular/buildRootIndex.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,UAAU,EAAE,MAAM,UAAU,CAAC;AAK/C,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIjE,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,gBAAgB,EAC3B,aAAa,EAAE,UAAU,QAoD1B;AAmHD,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAiED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,gBAAgB,QA8C5B"}
+{"version":3,"file":"buildRootIndex.d.ts","sourceRoot":"","sources":["../../../src/modular/buildRootIndex.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,UAAU,EAAE,MAAM,UAAU,CAAC;AAK/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,OAAO,EACL,aAAa,EACb,UAAU,EACV,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AAIrD,wBAAgB,cAAc,CAC5B,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,cAAc,EAAE,qBAAqB,EACrC,aAAa,EAAE,UAAU,QAoD1B;AAmHD,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAiED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE,aAAa,CAAC,mBAAmB,CAAC,EAC1C,cAAc,EAAE,qBAAqB,QA8CtC"}

package/dist/src/modular/buildRootIndex.js

@@ -2,20 +2,22 @@ import { NameType, normalizeName } from "@azure-tools/rlc-common";
 import { getClassicalClientName, getClientName } from "./helpers/namingHelpers.js";
 import { resolveReference } from "../framework/reference.js";
 import { PagingHelpers } from "./static-helpers-metadata.js";
-export function buildRootIndex(client, codeModel, rootIndexFile) {
-    var _a, _b;
-    const { project } = codeModel;
-    const srcPath = codeModel.modularOptions.sourceRoot;
-    const subfolder = (_a = client.subfolder) !== null && _a !== void 0 ? _a : "";
-    const clientName = `${getClassicalClientName(client.tcgcClient)}`;
-    const clientFile = project.getSourceFile(`${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}${normalizeName(clientName, NameType.File)}.ts`);
+import { getModularClientOptions } from "../utils/clientUtils.js";
+import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
+export function buildRootIndex(context, client, emitterOptions, rootIndexFile) {
+    var _a;
+    const { project } = emitterOptions;
+    const srcPath = emitterOptions.modularOptions.sourceRoot;
+    const { subfolder } = getModularClientOptions(context, client);
+    const clientName = `${getClassicalClientName(client)}`;
+    const clientFile = project.getSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}${normalizeName(clientName, NameType.File)}.ts`);
     if (!clientFile) {
         throw new Error(`Couldn't find client file: ${srcPath}/${normalizeName(clientName, NameType.File)}.ts`);
     }
-    exportClassicalClient(client, rootIndexFile, subfolder);
+    exportClassicalClient(client, rootIndexFile, subfolder !== null && subfolder !== void 0 ? subfolder : "");
     exportRestoreHelpers(rootIndexFile, project, srcPath, clientName, subfolder, true);
-    const modelsExportsIndex = (_b = rootIndexFile
-        .getExportDeclarations()) === null || _b === void 0 ? void 0 : _b.find((i) => {
+    const modelsExportsIndex = (_a = rootIndexFile
+        .getExportDeclarations()) === null || _a === void 0 ? void 0 : _a.find((i) => {
         return i.getModuleSpecifierValue() === `./models/index.js`;
     });
     if (!modelsExportsIndex) {
@@ -32,13 +34,13 @@ export function buildRootIndex(client, codeModel, rootIndexFile) {
         subfolder,
         isTopLevel: true
     });
-    exportPagingTypes(codeModel, rootIndexFile);
+    exportPagingTypes(context, rootIndexFile);
 }
 /**
  * This is a temporary solution for adding paging exports. Eventually we will have the binder generate the exports automatically.
  */
-function exportPagingTypes(codeModel, rootIndexFile) {
-    if (!hasPaging(codeModel)) {
+function exportPagingTypes(context, rootIndexFile) {
+    if (!hasPaging(context)) {
         return;
     }
     const existingExports = getExistingExports(rootIndexFile);
@@ -52,8 +54,16 @@ function exportPagingTypes(codeModel, rootIndexFile) {
         addExportsToRootIndexFile(rootIndexFile, newNamedExports);
     }
 }
-function hasPaging(codeModel) {
-    return codeModel.clients.some((c) => c.operationGroups.some((og) => og.operations.some((op) => op.discriminator === "paging" || op.discriminator === "lropaging")));
+function hasPaging(context) {
+    return context.sdkPackage.clients.some((client) => {
+        const methodMap = getMethodHierarchiesMap(context, client);
+        for (const [_, operations] of methodMap) {
+            if (operations.some((op) => op.kind === "paging" || op.kind === "lropaging")) {
+                return true;
+            }
+        }
+        return false;
+    });
 }
 function getExistingExports(rootIndexFile) {
     return new Set(rootIndexFile
@@ -69,7 +79,7 @@ function addExportsToRootIndexFile(rootIndexFile, newNamedExports) {
     });
 }
 function exportRestoreHelpers(indexFile, project, srcPath, clientName, subfolder = "", isTopLevel = false) {
-    const helperFile = project.getSourceFile(`${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}restorePollerHelpers.ts`);
+    const helperFile = project.getSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}restorePollerHelpers.ts`);
     if (!helperFile) {
         return;
     }
@@ -80,17 +90,17 @@ function exportRestoreHelpers(indexFile, project, srcPath, clientName, subfolder
         }
         return helper;
     });
-    const moduleSpecifier = `./${isTopLevel && subfolder !== "" ? subfolder + "/" : ""}restorePollerHelpers.js`;
+    const moduleSpecifier = `./${isTopLevel && subfolder && subfolder !== "" ? subfolder + "/" : ""}restorePollerHelpers.js`;
     indexFile.addExportDeclaration({
         moduleSpecifier,
         namedExports
     });
 }
 function exportClassicalClient(client, indexFile, subfolder, isSubClient = false) {
-    const clientName = `${getClientName(client.tcgcClient)}Client`;
+    const clientName = `${getClientName(client)}Client`;
     indexFile.addExportDeclaration({
         namedExports: [clientName],
-        moduleSpecifier: `./${subfolder !== "" && !isSubClient ? subfolder + "/" : ""}${normalizeName(clientName, NameType.File)}.js`
+        moduleSpecifier: `./${subfolder && subfolder !== "" && !isSubClient ? subfolder + "/" : ""}${normalizeName(clientName, NameType.File)}.js`
     });
 }
 function exportModules(indexFile, project, srcPath, clientName, moduleName, options = {
@@ -137,23 +147,22 @@ function exportModules(indexFile, project, srcPath, clientName, moduleName, opti
         namedExports
     });
 }
-export function buildSubClientIndexFile(client, codeModel) {
-    var _a;
-    const subfolder = (_a = client.subfolder) !== null && _a !== void 0 ? _a : "";
-    const srcPath = codeModel.modularOptions.sourceRoot;
-    const subClientIndexFile = codeModel.project.createSourceFile(`${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}index.ts`, undefined, { overwrite: true });
-    const clientName = `${getClientName(client.tcgcClient)}Client`;
-    const clientFilePath = `${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}${normalizeName(clientName, NameType.File)}.ts`;
-    const clientFile = codeModel.project.getSourceFile(clientFilePath);
+export function buildSubClientIndexFile(context, client, emitterOptions) {
+    const { subfolder } = getModularClientOptions(context, client);
+    const srcPath = emitterOptions.modularOptions.sourceRoot;
+    const subClientIndexFile = emitterOptions.project.createSourceFile(`${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}index.ts`, undefined, { overwrite: true });
+    const clientName = `${getClientName(client)}Client`;
+    const clientFilePath = `${srcPath}/${subfolder && subfolder !== "" ? subfolder + "/" : ""}${normalizeName(clientName, NameType.File)}.ts`;
+    const clientFile = emitterOptions.project.getSourceFile(clientFilePath);
     if (!clientFile) {
         throw new Error(`Couldn't find client file: ${clientFilePath}`);
     }
-    exportClassicalClient(client, subClientIndexFile, subfolder, true);
-    exportRestoreHelpers(subClientIndexFile, codeModel.project, srcPath, clientName, subfolder);
-    exportModules(subClientIndexFile, codeModel.project, srcPath, clientName, "api", {
+    exportClassicalClient(client, subClientIndexFile, subfolder !== null && subfolder !== void 0 ? subfolder : "", true);
+    exportRestoreHelpers(subClientIndexFile, emitterOptions.project, srcPath, clientName, subfolder);
+    exportModules(subClientIndexFile, emitterOptions.project, srcPath, clientName, "api", {
         subfolder,
         interfaceOnly: true
     });
-    exportModules(subClientIndexFile, codeModel.project, srcPath, clientName, "classic", { subfolder });
+    exportModules(subClientIndexFile, emitterOptions.project, srcPath, clientName, "classic", { subfolder });
 }
 //# sourceMappingURL=buildRootIndex.js.map