@azure-tools/typespec-ts 0.13.4 → 0.14.0

package/dist/src/modular/buildOperations.js

@@ -1,23 +1,56 @@
 import { buildType } from "./helpers/typeHelpers.js";
 import { getOperationFunction, getSendPrivateFunction, getDeserializePrivateFunction, getOperationOptionsName } from "./helpers/operationHelpers.js";
+import { isRLCMultiEndpoint } from "../utils/clientUtils.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, project, srcPath = "src") {
+export function buildOperationFiles(dpgContext, client, project, srcPath = "src", subfolder = "", needUnexpectedHelper = true) {
     for (const operationGroup of client.operationGroups) {
         const fileName = operationGroup.className
             ? `${operationGroup.className}`
             : // When the program has no operation groups defined all operations are put
                 // into a nameless operation group. We'll call this operations.
                 "operations";
-        const operationGroupFile = project.createSourceFile(`${srcPath}/src/api/${fileName}.ts`);
+        const operationGroupFile = project.createSourceFile(`${srcPath}/src/${subfolder && subfolder !== "" ? subfolder + "/" : ""}api/${fileName}.ts`);
+        // Import models used from ./models.ts
+        // We SHOULD keep this because otherwise ts-morph will "helpfully" try to import models from the rest layer when we call fixMissingImports().
+        importModels(srcPath, operationGroupFile, project, subfolder);
+        const namedImports = [];
+        let clientType = "Client";
+        if (isRLCMultiEndpoint(dpgContext)) {
+            namedImports.push(`Client`);
+            clientType = `Client.${client.rlcClientName}`;
+            if (needUnexpectedHelper) {
+                namedImports.push("UnexpectedHelper");
+            }
+            operationGroupFile.addImportDeclarations([
+                {
+                    moduleSpecifier: `../../rest/${subfolder}/index.js`,
+                    namedImports
+                }
+            ]);
+        }
+        else {
+            if (needUnexpectedHelper) {
+                namedImports.push("isUnexpected");
+            }
+            const rlcClientName = client.rlcClientName;
+            namedImports.push(`${rlcClientName} as Client`);
+            operationGroupFile.addImportDeclarations([
+                {
+                    moduleSpecifier: `${subfolder && subfolder !== "" ? "../" : ""}../rest/index.js`,
+                    namedImports
+                }
+            ]);
+        }
+        const modelOptionsFile = project.createSourceFile(`${srcPath}/src/${subfolder}/models/options.ts`);
         operationGroup.operations.forEach((o) => {
-            buildOperationOptions(o, operationGroupFile);
-            const operationDeclaration = getOperationFunction(o);
-            const sendOperationDeclaration = getSendPrivateFunction(o);
-            const deserializeOperationDeclaration = getDeserializePrivateFunction(o);
+            buildOperationOptions(o, modelOptionsFile);
+            const operationDeclaration = getOperationFunction(o, clientType);
+            const sendOperationDeclaration = getSendPrivateFunction(o, clientType);
+            const deserializeOperationDeclaration = getDeserializePrivateFunction(o, isRLCMultiEndpoint(dpgContext), needUnexpectedHelper);
             operationGroupFile.addFunctions([
                 sendOperationDeclaration,
                 deserializeOperationDeclaration,
@@ -26,40 +59,49 @@ export function buildOperationFiles(client, project, srcPath = "src") {
         });
         operationGroupFile.addImportDeclarations([
             {
-                moduleSpecifier: "../rest/index.js",
-                namedImports: [`${client.name}Context as Client`, "isUnexpected"]
-            }
-        ]);
-        operationGroupFile.addImportDeclarations([
-            {
-                moduleSpecifier: "../common/interfaces.js",
-                namedImports: ["OperationRawReturnType"]
+                moduleSpecifier: "@azure-rest/core-client",
+                namedImports: [
+                    "StreamableMethod",
+                    "operationOptionsToRequestParameters"
+                ]
             }
         ]);
-        operationGroupFile.addImportDeclarations([
+        modelOptionsFile.addImportDeclarations([
             {
                 moduleSpecifier: "@azure-rest/core-client",
-                namedImports: ["StreamableMethod"]
+                namedImports: ["OperationOptions"]
             }
         ]);
-        // Import models used from ./models.ts
-        importModels(operationGroupFile, project);
+        modelOptionsFile.fixMissingImports();
+        modelOptionsFile
+            .getImportDeclarations()
+            .filter((id) => {
+            return (id.isModuleSpecifierRelative() &&
+                !id.getModuleSpecifierValue().endsWith(".js"));
+        })
+            .map((id) => {
+            id.setModuleSpecifier(id.getModuleSpecifierValue() + ".js");
+            return id;
+        });
         operationGroupFile.fixMissingImports();
+        // have to fixUnusedIdentifiers after everything get generated.
+        operationGroupFile.fixUnusedIdentifiers();
     }
 }
-function importModels(sourceFile, project) {
+function importModels(srcPath, sourceFile, project, subfolder = "") {
     var _a;
-    const modelsFile = project.getSourceFile("models.ts");
+    const modelsFile = project.getSourceFile(`${srcPath}/src/${subfolder && subfolder !== "" ? subfolder + "/" : ""}models/models.ts`);
     const models = [];
     for (const entry of (_a = modelsFile === null || modelsFile === void 0 ? void 0 : modelsFile.getExportedDeclarations().entries()) !== null && _a !== void 0 ? _a : []) {
         models.push(entry[0]);
     }
     sourceFile.addImportDeclaration({
-        moduleSpecifier: "./models.js",
+        moduleSpecifier: "../models/models.js",
         namedImports: models
     });
     // Import all models and then let ts-morph clean up the unused ones
-    sourceFile.fixUnusedIdentifiers();
+    // we can't fixUnusedIdentifiers here because the operaiton files are still being generated.
+    // sourceFile.fixUnusedIdentifiers();
 }
 /**
  * This function generates the interfaces for each operation options
@@ -75,7 +117,7 @@ export function buildOperationOptions(operation, sourceFile) {
     sourceFile.addInterface({
         name,
         isExported: true,
-        extends: ["RequestOptions"],
+        extends: ["OperationOptions"],
         properties: options.map((p) => {
             return {
                 docs: [p.description],

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.map

@@ -1 +1 @@
-{"version":3,"file":"buildProjectFiles.d.ts","sourceRoot":"","sources":["../../../src/modular/buildProjectFiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,wBAAgB,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,gBAAgB,iCAgL5B;AAED,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,gBAAgB,iCA+B5B"}
+{"version":3,"file":"buildProjectFiles.d.ts","sourceRoot":"","sources":["../../../src/modular/buildProjectFiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGzD,wBAAgB,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,gBAAgB,iCAuM5B;AAED,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,gBAAgB,iCA+B5B"}

package/dist/src/modular/buildProjectFiles.js

@@ -1,3 +1,4 @@
+import { NameType, normalizeName } from "@azure-tools/rlc-common";
 export function emitPackage(project, srcPath, codeModel) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     const packageJson = project.createSourceFile(`${srcPath}/package-files/package.json`, "", {
@@ -6,7 +7,7 @@ export function emitPackage(project, srcPath, codeModel) {
     const content = {
         name: `${(_c = (_b = (_a = codeModel.options) === null || _a === void 0 ? void 0 : _a.packageDetails) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : "@msinternal/unamedpackage"}`,
         version: "1.0.0-beta.1",
-        description: `"${(_e = (_d = codeModel.options) === null || _d === void 0 ? void 0 : _d.packageDetails) === null || _e === void 0 ? void 0 : _e.description}"`,
+        description: `${(_e = (_d = codeModel.options) === null || _d === void 0 ? void 0 : _d.packageDetails) === null || _e === void 0 ? void 0 : _e.description}`,
         "sdk-type": "client",
         main: "dist/index.js",
         module: "dist-esm/src/index.js",
@@ -24,9 +25,9 @@ export function emitPackage(project, srcPath, codeModel) {
                 types: "./types/src/api/index.d.ts",
                 import: "./dist-esm/src/api/index.js"
             },
-            "./rest": {
-                types: "./types/src/rest/index.d.ts",
-                import: "./dist-esm/src/rest/index.js"
+            "./models": {
+                types: "./types/src/models/index.d.ts",
+                import: "./dist-esm/src/models/index.js"
             }
         },
         "//metadata": {
@@ -151,6 +152,25 @@ export function emitPackage(project, srcPath, codeModel) {
             tslib: "^2.4.0"
         }
     };
+    if (codeModel.clients.length > 1) {
+        delete content.exports["./api"];
+        delete content.exports["./models"];
+        for (const client of codeModel.clients) {
+            const subfolder = normalizeName(client.name.replace("Client", ""), NameType.File);
+            content.exports[`./${subfolder}`] = {
+                types: `./types/src/${subfolder}/index.d.ts`,
+                import: `./dist-esm/src/${subfolder}/index.js`
+            };
+            content.exports[`./${subfolder}/api`] = {
+                types: `./types/src/${subfolder}/api/index.d.ts`,
+                import: `./dist-esm/src/${subfolder}/api/index.js`
+            };
+            content.exports[`./${subfolder}/models`] = {
+                types: `./types/src/${subfolder}/models/index.d.ts`,
+                import: `./dist-esm/src/${subfolder}/models/index.js`
+            };
+        }
+    }
     packageJson.addStatements(JSON.stringify(content));
     return packageJson;
 }

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

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

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

@@ -1,4 +1,5 @@
-import { Project } from "ts-morph";
+import { Project, SourceFile } from "ts-morph";
 import { Client } from "./modularCodeModel.js";
-export declare function buildRootIndex(client: Client, project: Project, srcPath: string): void;
+export declare function buildRootIndex(client: Client, project: Project, rootIndexFile: SourceFile, srcPath: string, subfolder: string): void;
+export declare function buildSubClientIndexFile(client: Client, project: Project, srcPath: string, subfolder: string): 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":"AAAA,OAAO,EAAE,OAAO,EAAc,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,QAyBhB"}
+{"version":3,"file":"buildRootIndex.d.ts","sourceRoot":"","sources":["../../../src/modular/buildRootIndex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,UAAU,EACzB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAelB;AAkDD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAmBlB"}

package/dist/src/modular/buildRootIndex.js

@@ -1,66 +1,47 @@
 import { getClientName } from "./helpers/namingHelpers.js";
-export function buildRootIndex(client, project, srcPath) {
+export function buildRootIndex(client, project, rootIndexFile, srcPath, subfolder) {
     const clientName = `${getClientName(client)}Client`;
-    const clientFile = project.getSourceFile(`${srcPath}/src/${clientName}.ts`);
+    const clientFile = project.getSourceFile(`${srcPath}/src/${subfolder !== "" ? subfolder + "/" : ""}${clientName}.ts`);
     if (!clientFile) {
         throw new Error(`Couldn't find client file: ${srcPath}/src/${clientName}.ts`);
     }
-    const file = project.createSourceFile(`${srcPath}/src/index.ts`, "", {
-        overwrite: true
-    });
-    exportModels(file, srcPath);
-    exportOptionsInterfaces(client, file, srcPath);
-    exportClassicalClient(client, file);
-    file.addExportDeclarations([
-        {
-            moduleSpecifier: `./common/interfaces.js`,
-            namedExports: [`RequestOptions`]
-        }
-    ]);
+    exportClassicalClient(client, rootIndexFile, subfolder);
+    exportModels(rootIndexFile, project, srcPath, clientName, subfolder, true);
 }
-function exportClassicalClient(client, indexFile) {
+function exportClassicalClient(client, indexFile, subfolder, isSubClient = false) {
     const clientName = `${getClientName(client)}Client`;
     indexFile.addExportDeclaration({
         namedExports: [clientName, `${clientName}Options`],
-        moduleSpecifier: `./${clientName}.js`
+        moduleSpecifier: `./${subfolder !== "" && !isSubClient ? subfolder + "/" : ""}${clientName}.js`
     });
 }
-function exportOptionsInterfaces(client, indexFile, srcPath) {
-    var _a, _b;
-    const clientContextName = `${getClientName(client)}Context`;
-    const project = indexFile.getProject();
-    const files = project.getSourceFiles(`${srcPath}/src/api/**`);
-    for (const file of files) {
-        if (file.getBaseNameWithoutExtension() === clientContextName) {
-            continue;
-        }
-        if (file.getBaseNameWithoutExtension() === "models") {
-            continue;
-        }
-        if (file.getBaseNameWithoutExtension() === "index") {
-            continue;
-        }
-        const namedExports = [];
-        for (const [key, delaration] of file.getExportedDeclarations().entries()) {
-            if (((_a = delaration[0]) === null || _a === void 0 ? void 0 : _a.getKindName()) === "InterfaceDeclaration" ||
-                ((_b = delaration[0]) === null || _b === void 0 ? void 0 : _b.getKindName()) === "TypeAliasDeclaration") {
-                namedExports.push(key);
-            }
-        }
-        if (namedExports.length > 0) {
-            const moduleSpecifier = `./api/${file.getBaseNameWithoutExtension()}.js`;
-            indexFile.addExportDeclaration({ moduleSpecifier, namedExports });
-        }
-    }
-}
-function exportModels(indexFile, srcPath) {
-    const project = indexFile.getProject();
-    const modelsFile = project.getSourceFile(`${srcPath}/src/api/models.ts`);
+function exportModels(indexFile, project, srcPath, clientName, subfolder = "", isTopLevel = false) {
+    const modelsFile = project.getSourceFile(`${srcPath}/src/${subfolder !== "" ? subfolder + "/" : ""}models/index.ts`);
     if (!modelsFile) {
         return;
     }
-    const namedExports = [...modelsFile.getExportedDeclarations().keys()];
-    const moduleSpecifier = "./api/models.js";
-    indexFile.addExportDeclaration({ moduleSpecifier, namedExports });
+    const exported = [...indexFile.getExportedDeclarations().keys()];
+    const namedExports = [...modelsFile.getExportedDeclarations().keys()].map((modelName) => {
+        if (exported.indexOf(modelName) > -1) {
+            return `${modelName} as ${clientName}${modelName}`;
+        }
+        return modelName;
+    });
+    const moduleSpecifier = `./${isTopLevel && subfolder !== "" ? subfolder + "/" : ""}models/index.js`;
+    indexFile.addExportDeclaration({
+        moduleSpecifier,
+        namedExports
+    });
+}
+export function buildSubClientIndexFile(client, project, srcPath, subfolder) {
+    const subClientIndexFile = project.createSourceFile(`${srcPath}/src/${subfolder !== "" ? subfolder + "/" : ""}index.ts`, undefined, { overwrite: true });
+    const clientName = `${getClientName(client)}Client`;
+    const clientFilePath = `${srcPath}/src/${subfolder !== "" ? subfolder + "/" : ""}${clientName}.ts`;
+    const clientFile = project.getSourceFile(clientFilePath);
+    if (!clientFile) {
+        throw new Error(`Couldn't find client file: ${clientFilePath}`);
+    }
+    exportClassicalClient(client, subClientIndexFile, subfolder, true);
+    exportModels(subClientIndexFile, project, srcPath, clientName, subfolder);
 }
 //# sourceMappingURL=buildRootIndex.js.map

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

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

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

@@ -0,0 +1,3 @@
+import { Project } from "ts-morph";
+export declare function buildSubpathIndexFile(project: Project, srcPath: string, subpath: string, subfolder: string): void;
+//# sourceMappingURL=buildSubpathIndex.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"buildSubpathIndex.d.ts","sourceRoot":"","sources":["../../../src/modular/buildSubpathIndex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,QAelB"}

package/dist/src/modular/{buildApiIndex.js → buildSubpathIndex.js}

@@ -1,6 +1,6 @@
-export function buildApiIndexFile(project, srcPath) {
-    const apiFiles = project.getSourceFiles("**/src/api/**");
-    const indexFile = project.createSourceFile(`${srcPath}/src/api/index.ts`);
+export function buildSubpathIndexFile(project, srcPath, subpath, subfolder) {
+    const apiFiles = project.getSourceFiles(`**/src/${subfolder}/${subpath}/**`);
+    const indexFile = project.createSourceFile(`${srcPath}/src/${subfolder}/${subpath}/index.ts`);
     for (const file of apiFiles) {
         const exports = [...file.getExportedDeclarations().keys()].filter((k) => !k.startsWith("_"));
         indexFile.addExportDeclaration({
@@ -9,4 +9,4 @@ export function buildApiIndexFile(project, srcPath) {
         });
     }
 }
-//# sourceMappingURL=buildApiIndex.js.map
+//# sourceMappingURL=buildSubpathIndex.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"buildSubpathIndex.js","sourceRoot":"","sources":["../../../src/modular/buildSubpathIndex.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,qBAAqB,CACnC,OAAgB,EAChB,OAAe,EACf,OAAe,EACf,SAAiB;IAEjB,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,CAAC,UAAU,SAAS,IAAI,OAAO,KAAK,CAAC,CAAC;IAC7E,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CACxC,GAAG,OAAO,QAAQ,SAAS,IAAI,OAAO,WAAW,CAClD,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE;QAC3B,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAC1B,CAAC;QACF,SAAS,CAAC,oBAAoB,CAAC;YAC7B,eAAe,EAAE,KAAK,IAAI,CAAC,2BAA2B,EAAE,KAAK;YAC7D,YAAY,EAAE,OAAO;SACtB,CAAC,CAAC;KACJ;AACH,CAAC"}

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

@@ -3,5 +3,5 @@ import { ModularCodeModel } from "./modularCodeModel.js";
 /**
  * This function creates the file containing all the models defined in TypeSpec
  */
-export declare function buildModels(codeModel: ModularCodeModel, project: Project, srcPath?: string): SourceFile;
+export declare function buildModels(codeModel: ModularCodeModel, project: Project, srcPath?: string, subfolder?: string): SourceFile;
 //# sourceMappingURL=emitModels.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"emitModels.d.ts","sourceRoot":"","sources":["../../../src/modular/emitModels.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,gBAAgB,EAAQ,MAAM,uBAAuB,CAAC;AAE/D;;GAEG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,MAAc,GACtB,UAAU,CA+FZ"}
+{"version":3,"file":"emitModels.d.ts","sourceRoot":"","sources":["../../../src/modular/emitModels.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE/C,OAAO,EAAE,gBAAgB,EAAQ,MAAM,uBAAuB,CAAC;AAG/D;;GAEG;AACH,wBAAgB,WAAW,CACzB,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,MAAc,EACvB,SAAS,GAAE,MAAW,GACrB,UAAU,CAiGZ"}

package/dist/src/modular/emitModels.js

@@ -1,10 +1,11 @@
 import { getType } from "./helpers/typeHelpers.js";
+import * as path from "path";
 /**
  * This function creates the file containing all the models defined in TypeSpec
  */
-export function buildModels(codeModel, project, srcPath = "src") {
+export function buildModels(codeModel, project, srcPath = "src", subfolder = "") {
     var _a, _b, _c, _d, _e, _f;
-    const modelsFile = project.createSourceFile(`${srcPath}/src/api/models.ts`);
+    const modelsFile = project.createSourceFile(path.join(`${srcPath}/src/`, subfolder, `models/models.ts`));
     // We are generating both models and enums here
     const coreClientTypes = new Set();
     const models = codeModel.types.filter((t) => (t.type === "model" || t.type === "enum") && !isAzureCoreError(t));

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

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

package/dist/src/modular/helpers/clientHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,GACb,YAAY,CAAC,6BAA6B,CAAC,EAAE,CAqB/C"}
+{"version":3,"file":"clientHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,GACb,YAAY,CAAC,6BAA6B,CAAC,EAAE,CAyB/C"}

package/dist/src/modular/helpers/clientHelpers.js

@@ -8,7 +8,8 @@ export function getClientParameters(client) {
     };
     const params = [
         ...parameters
-            .filter((p) => p.type.type !== "constant")
+            .filter((p) => p.type.type !== "constant" &&
+            (p.clientDefaultValue === null || p.clientDefaultValue === undefined))
             .map((p) => {
             return {
                 name: p.clientName,

package/dist/src/modular/helpers/clientHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"clientHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,UAAU,mBAAmB,CACjC,MAAc;IAEd,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IACpC,MAAM,YAAY,GAAG;QACnB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,GAAG,IAAI,eAAe;QAC5B,WAAW,EAAE,IAAI;KAClB,CAAC;IAEF,MAAM,MAAM,GAAkD;QAC5D,GAAG,UAAU;aACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC;aACzC,GAAG,CAA8C,CAAC,CAAC,EAAE,EAAE;YACtD,OAAO;gBACL,IAAI,EAAE,CAAC,CAAC,UAAU;gBAClB,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC;aAC1B,CAAC;QACJ,CAAC,CAAC;QACJ,YAAY;KACb,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"clientHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,UAAU,mBAAmB,CACjC,MAAc;IAEd,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IACpC,MAAM,YAAY,GAAG;QACnB,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,GAAG,IAAI,eAAe;QAC5B,WAAW,EAAE,IAAI;KAClB,CAAC;IAEF,MAAM,MAAM,GAAkD;QAC5D,GAAG,UAAU;aACV,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU;YAC1B,CAAC,CAAC,CAAC,kBAAkB,KAAK,IAAI,IAAI,CAAC,CAAC,kBAAkB,KAAK,SAAS,CAAC,CACxE;aACA,GAAG,CAA8C,CAAC,CAAC,EAAE,EAAE;YACtD,OAAO;gBACL,IAAI,EAAE,CAAC,CAAC,UAAU;gBAClB,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC;aAC1B,CAAC;QACJ,CAAC,CAAC;QACJ,YAAY;KACb,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/src/modular/helpers/namingHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"namingHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/namingHelpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAEL,QAAQ,EAET,MAAM,yBAAyB,CAAC;AAEjC,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,UAE3C;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,SAAS,EACpB,OAAO,GAAE;IAAE,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAA;CAAwB,GAC5D,WAAW,CAeb;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAKxE"}
+{"version":3,"file":"namingHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/namingHelpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAEL,QAAQ,EAET,MAAM,yBAAyB,CAAC;AAEjC,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,UAE3C;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,SAAS,EACpB,OAAO,GAAE;IAAE,MAAM,EAAE,OAAO,GAAG,QAAQ,CAAA;CAAwB,GAC5D,WAAW,CAeb;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAMxE"}

package/dist/src/modular/helpers/namingHelpers.js

@@ -19,6 +19,7 @@ export function getOperationName(operation, options = { casing: "camel" }) {
     };
 }
 export function isReservedName(name, nameType) {
-    return ReservedModelNames.some((reservedName) => reservedName.name === name && reservedName.reservedFor.includes(nameType));
+    return ReservedModelNames.some((reservedName) => reservedName.name === name.toLowerCase() &&
+        reservedName.reservedFor.includes(nameType));
 }
 //# sourceMappingURL=namingHelpers.js.map

package/dist/src/modular/helpers/namingHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"namingHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/namingHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EACL,kBAAkB,EAClB,QAAQ,EACR,aAAa,EACd,MAAM,yBAAyB,CAAC;AAEjC,MAAM,UAAU,aAAa,CAAC,MAAc;IAC1C,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAC5C,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAC9B,SAAoB,EACpB,UAA0C,EAAE,MAAM,EAAE,OAAO,EAAE;IAE7D,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC;IACzE,IAAI,cAAc,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE;QACtD,OAAO;YACL,IAAI,EAAE,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;YAC7D,KAAK,EAAE;gBACL,GAAG,SAAS,CAAC,IAAI;2FACkE;aACpF;SACF,CAAC;KACH;IAED,OAAO;QACL,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC;KAC/B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,QAAkB;IAC7D,OAAO,kBAAkB,CAAC,IAAI,CAC5B,CAAC,YAAY,EAAE,EAAE,CACf,YAAY,CAAC,IAAI,KAAK,IAAI,IAAI,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAC5E,CAAC;AACJ,CAAC"}
+{"version":3,"file":"namingHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/namingHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAEvE,OAAO,EACL,kBAAkB,EAClB,QAAQ,EACR,aAAa,EACd,MAAM,yBAAyB,CAAC;AAEjC,MAAM,UAAU,aAAa,CAAC,MAAc;IAC1C,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;AAC5C,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAC9B,SAAoB,EACpB,UAA0C,EAAE,MAAM,EAAE,OAAO,EAAE;IAE7D,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC;IACzE,IAAI,cAAc,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE;QACtD,OAAO;YACL,IAAI,EAAE,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;YAC7D,KAAK,EAAE;gBACL,GAAG,SAAS,CAAC,IAAI;2FACkE;aACpF;SACF,CAAC;KACH;IAED,OAAO;QACL,IAAI,EAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC;KAC/B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,QAAkB;IAC7D,OAAO,kBAAkB,CAAC,IAAI,CAC5B,CAAC,YAAY,EAAE,EAAE,CACf,YAAY,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE;QACxC,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAC9C,CAAC;AACJ,CAAC"}

package/dist/src/modular/helpers/operationHelpers.d.ts

@@ -1,10 +1,10 @@
 import { FunctionDeclarationStructure, OptionalKind } from "ts-morph";
 import { Operation } from "../modularCodeModel.js";
-export declare function getSendPrivateFunction(operation: Operation): OptionalKind<FunctionDeclarationStructure>;
-export declare function getDeserializePrivateFunction(operation: Operation): OptionalKind<FunctionDeclarationStructure>;
+export declare function getSendPrivateFunction(operation: Operation, clientType: string): OptionalKind<FunctionDeclarationStructure>;
+export declare function getDeserializePrivateFunction(operation: Operation, needSubClient: boolean, needUnexpectedHelper: boolean): OptionalKind<FunctionDeclarationStructure>;
 /**
  * This operation builds and returns the function declaration for an operation.
  */
-export declare function getOperationFunction(operation: Operation): OptionalKind<FunctionDeclarationStructure>;
+export declare function getOperationFunction(operation: Operation, clientType: string): OptionalKind<FunctionDeclarationStructure>;
 export declare function getOperationOptionsName(operation: Operation): string;
 //# sourceMappingURL=operationHelpers.d.ts.map

package/dist/src/modular/helpers/operationHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operationHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/operationHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,YAAY,EAEb,MAAM,UAAU,CAAC;AAElB,OAAO,EAEL,SAAS,EAIV,MAAM,wBAAwB,CAAC;AAgBhC,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,SAAS,GACnB,YAAY,CAAC,4BAA4B,CAAC,CA4B5C;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,SAAS,GACnB,YAAY,CAAC,4BAA4B,CAAC,CA+C5C;AAoDD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,SAAS,GACnB,YAAY,CAAC,4BAA4B,CAAC,CAgC5C;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,SAAS,UAI3D"}
+{"version":3,"file":"operationHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/operationHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,4BAA4B,EAC5B,YAAY,EAEb,MAAM,UAAU,CAAC;AAElB,OAAO,EAEL,SAAS,EAIV,MAAM,wBAAwB,CAAC;AA6BhC,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,GACjB,YAAY,CAAC,4BAA4B,CAAC,CA+B5C;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,OAAO,EACtB,oBAAoB,EAAE,OAAO,GAC5B,YAAY,CAAC,4BAA4B,CAAC,CAgE5C;AA6DD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,GACjB,YAAY,CAAC,4BAA4B,CAAC,CAgC5C;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,SAAS,UAI3D"}