@autorest/typescript 6.0.0-beta.7 → 6.0.0-rc.1

package/dist/src/generators/indexGenerator.js

@@ -2,36 +2,168 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateIndexFile = void 0;
 const autorestSession_1 = require("../autorestSession");
-function generateIndexFile(clientDetails, project) {
-    const { srcPath, disablePagingAsyncIterators } = autorestSession_1.getAutorestOptions();
+const nameUtils_1 = require("../utils/nameUtils");
+const extractPaginationDetails_1 = require("../utils/extractPaginationDetails");
+const hasPollingOperations_1 = require("../restLevelClient/helpers/hasPollingOperations");
+const modelHelpers_1 = require("../restLevelClient/helpers/modelHelpers");
+function generateIndexFile(project, clientDetails) {
+    const { restLevelClient, srcPath, multiClient, batch } = (0, autorestSession_1.getAutorestOptions)();
     const indexFile = project.createSourceFile(`${srcPath}/index.ts`, undefined, {
         overwrite: true
     });
+    if (!restLevelClient) {
+        if (!clientDetails) {
+            throw new Error("ClientDetails are required when generating High Level Clients");
+        }
+        generateHLCIndex(clientDetails, indexFile);
+    }
+    else if (!multiClient || !batch || (batch === null || batch === void 0 ? void 0 : batch.length) === 1) {
+        // if we are generate single client package for RLC
+        generateRLCIndex(indexFile);
+    }
+    else {
+        generateRLCIndexForMultiClient(indexFile);
+    }
+}
+exports.generateIndexFile = generateIndexFile;
+// to generate a index.ts for each single module inside the multi client RLC package
+function generateRLCIndexForMultiClient(file) {
+    const { model } = (0, autorestSession_1.getSession)();
+    const clientName = model.language.default.name;
+    const createClientFuncName = `createClient`;
+    const moduleName = (0, nameUtils_1.normalizeName)(clientName, nameUtils_1.NameType.File);
+    file.addImportDeclaration({
+        namespaceImport: "Parameters",
+        moduleSpecifier: "./parameters"
+    });
+    file.addImportDeclaration({
+        namespaceImport: "Responses",
+        moduleSpecifier: "./responses"
+    });
+    file.addImportDeclaration({
+        namespaceImport: "Client",
+        moduleSpecifier: "./clientDefinitions"
+    });
+    const exports = ["Parameters", "Responses", "Client"];
+    if ((0, modelHelpers_1.hasInputModels)(model)) {
+        file.addImportDeclaration({
+            namespaceImport: "Models",
+            moduleSpecifier: "./models"
+        });
+        exports.push("Models");
+    }
+    if ((0, modelHelpers_1.hasOutputModels)(model)) {
+        file.addImportDeclaration({
+            namespaceImport: "OutputModels",
+            moduleSpecifier: "./outputModels"
+        });
+        exports.push("OutputModels");
+    }
+    if ((0, extractPaginationDetails_1.hasPagingOperations)(model)) {
+        file.addImportDeclaration({
+            namespaceImport: "PaginateHelper",
+            moduleSpecifier: "./paginateHelper"
+        });
+        exports.push("PaginateHelper");
+    }
+    if ((0, hasPollingOperations_1.hasPollingOperations)(model)) {
+        file.addImportDeclaration({
+            namespaceImport: "PollingHelper",
+            moduleSpecifier: "./pollingHelper"
+        });
+        exports.push("PollingHelper");
+    }
+    file.addExportDeclarations([
+        {
+            moduleSpecifier: `./${moduleName}`,
+            namedExports: [`${createClientFuncName}`]
+        },
+        {
+            namedExports: [...exports]
+        }
+    ]);
+}
+function generateRLCIndex(file) {
+    const { model } = (0, autorestSession_1.getSession)();
+    const clientName = model.language.default.name;
+    const createClientFuncName = `${clientName}`;
+    const moduleName = (0, nameUtils_1.normalizeName)(clientName, nameUtils_1.NameType.File);
+    file.addImportDeclaration({
+        moduleSpecifier: `./${moduleName}`,
+        defaultImport: createClientFuncName
+    });
+    file.addExportDeclarations([
+        {
+            moduleSpecifier: `./${moduleName}`
+        },
+        {
+            moduleSpecifier: "./parameters"
+        },
+        {
+            moduleSpecifier: "./responses"
+        },
+        {
+            moduleSpecifier: "./clientDefinitions"
+        },
+        {
+            moduleSpecifier: "./isUnexpected"
+        }
+    ]);
+    if ((0, modelHelpers_1.hasInputModels)(model)) {
+        file.addExportDeclarations([
+            {
+                moduleSpecifier: "./models"
+            }
+        ]);
+    }
+    if ((0, modelHelpers_1.hasOutputModels)(model)) {
+        file.addExportDeclarations([
+            {
+                moduleSpecifier: "./outputModels"
+            }
+        ]);
+    }
+    if ((0, extractPaginationDetails_1.hasPagingOperations)(model)) {
+        file.addExportDeclarations([
+            {
+                moduleSpecifier: "./paginateHelper"
+            }
+        ]);
+    }
+    if ((0, hasPollingOperations_1.hasPollingOperations)(model)) {
+        file.addExportDeclarations([
+            {
+                moduleSpecifier: "./pollingHelper"
+            }
+        ]);
+    }
+    file.addExportAssignment({
+        expression: createClientFuncName,
+        isExportEquals: false
+    });
+}
+function generateHLCIndex(clientDetails, file) {
+    const { disablePagingAsyncIterators } = (0, autorestSession_1.getAutorestOptions)();
     if (clientDetails.options.hasPaging && !disablePagingAsyncIterators) {
-        indexFile.addStatements([`/// <reference lib="esnext.asynciterable" />`]);
+        file.addStatements([`/// <reference lib="esnext.asynciterable" />`]);
     }
-    indexFile.addExportDeclarations([
+    file.addExportDeclarations([
         {
             moduleSpecifier: "./models"
         },
         {
             moduleSpecifier: `./${clientDetails.sourceFileName}`,
             namedExports: [clientDetails.className]
-        },
-        {
-            moduleSpecifier: `./${clientDetails.sourceFileName}Context`,
-            namedExports: [`${clientDetails.className}Context`]
         }
     ]);
     const operationGroups = clientDetails.operationGroups.filter(og => !og.isTopLevel);
     if (operationGroups.length) {
-        indexFile.addExportDeclarations([
+        file.addExportDeclarations([
             {
                 moduleSpecifier: "./operationsInterfaces"
             }
         ]);
     }
-    indexFile.fixUnusedIdentifiers();
+    file.fixUnusedIdentifiers();
 }
-exports.generateIndexFile = generateIndexFile;
 //# sourceMappingURL=indexGenerator.js.map

package/dist/src/generators/indexGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"indexGenerator.js","sourceRoot":"","sources":["../../../src/generators/indexGenerator.ts"],"names":[],"mappings":";;;AAEA,wDAAwD;AAExD,SAAgB,iBAAiB,CAC/B,aAA4B,EAC5B,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,2BAA2B,EAAE,GAAG,oCAAkB,EAAE,CAAC;IACtE,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,WAAW,EAAE,SAAS,EAAE;QAC3E,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,2BAA2B,EAAE;QACnE,SAAS,CAAC,aAAa,CAAC,CAAC,8CAA8C,CAAC,CAAC,CAAC;KAC3E;IAED,SAAS,CAAC,qBAAqB,CAAC;QAC9B;YACE,eAAe,EAAE,UAAU;SAC5B;QACD;YACE,eAAe,EAAE,KAAK,aAAa,CAAC,cAAc,EAAE;YACpD,YAAY,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC;SACxC;QACD;YACE,eAAe,EAAE,KAAK,aAAa,CAAC,cAAc,SAAS;YAC3D,YAAY,EAAE,CAAC,GAAG,aAAa,CAAC,SAAS,SAAS,CAAC;SACpD;KACF,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,aAAa,CAAC,eAAe,CAAC,MAAM,CAC1D,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CACrB,CAAC;IAEF,IAAI,eAAe,CAAC,MAAM,EAAE;QAC1B,SAAS,CAAC,qBAAqB,CAAC;YAC9B;gBACE,eAAe,EAAE,wBAAwB;aAC1C;SACF,CAAC,CAAC;KACJ;IAED,SAAS,CAAC,oBAAoB,EAAE,CAAC;AACnC,CAAC;AAxCD,8CAwCC"}
+{"version":3,"file":"indexGenerator.js","sourceRoot":"","sources":["../../../src/generators/indexGenerator.ts"],"names":[],"mappings":"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"}

package/dist/src/generators/mappersGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mappersGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/mappersGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EACL,OAAO,EAEP,eAAe,EAEhB,MAAM,UAAU,CAAC;AAElB,OAAO,EAEL,MAAM,EAMP,MAAM,kBAAkB,CAAC;AAQ1B,wBAAgB,eAAe,CAC7B,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,OAAO,QA4BjB;AAwGD,wBAAgB,WAAW,CAAC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,QAsBlE"}
+{"version":3,"file":"mappersGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/mappersGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EACL,OAAO,EAEP,eAAe,EAEhB,MAAM,UAAU,CAAC;AAElB,OAAO,EAEL,MAAM,EAMP,MAAM,kBAAkB,CAAC;AAQ1B,wBAAgB,eAAe,CAC7B,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,OAAO,QA4BjB;AAgMD,wBAAgB,WAAW,CAAC,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,QAsBlE"}

package/dist/src/generators/mappersGenerator.js

@@ -23,7 +23,7 @@ const modelDetails_1 = require("../models/modelDetails");
 const logger_1 = require("../utils/logger");
 const autorestSession_1 = require("../autorestSession");
 function generateMappers(clientDetails, project) {
-    const { useCoreV2, srcPath } = autorestSession_1.getAutorestOptions();
+    const { useCoreV2, srcPath } = (0, autorestSession_1.getAutorestOptions)();
     if (!clientDetails.mappers.length) {
         logger_1.logger.info("No mappers in code model, skipping mapper file generation");
         return;
@@ -46,13 +46,71 @@ function generateMappers(clientDetails, project) {
     mappersFile.fixUnusedIdentifiers();
 }
 exports.generateMappers = generateMappers;
+function getParents(mapperParentMap, parent) {
+    const list = new Array();
+    const parents = mapperParentMap.get(parent);
+    if (!parents) {
+        parents.forEach(pnt => {
+            if (!list.includes(pnt)) {
+                getParents(mapperParentMap, pnt).forEach(str => list.push(str));
+            }
+        });
+    }
+    if (!list.includes(parent)) {
+        list.push(parent);
+    }
+    return list;
+}
+function traverse(mapperParentMap) {
+    const list = new Array();
+    mapperParentMap.forEach((value, key) => {
+        value.forEach(parent => {
+            if (!list.includes(parent)) {
+                getParents(mapperParentMap, parent).forEach(str => list.push(str));
+            }
+        });
+        if (!list.includes(key)) {
+            list.push(key);
+        }
+    });
+    return list;
+}
 /**
  * This function writes to the mappers.ts file all the mappers to be used by @azure/core-http for serialization
  */
 function writeMappers(sourceFile, { mappers }) {
-    const { useCoreV2 } = autorestSession_1.getAutorestOptions();
-    const generatedMappers = new Map();
+    const mapperParentMap = new Map();
+    const mapperPositionMap = new Map();
+    let position = 0;
     mappers.forEach(mapper => {
+        const compositeMapper = mapper;
+        const mapperClassName = compositeMapper.type.className;
+        if (!mapperClassName)
+            return;
+        mapperPositionMap.set(mapperClassName, position);
+        position += 1;
+        let listOfParents = mapperParentMap.get(mapperClassName);
+        if (!listOfParents) {
+            listOfParents = new Array();
+        }
+        if (compositeMapper.type.modelProperties &&
+            compositeMapper.type.modelProperties.parentsRefs) {
+            const { parentsRefs } = (compositeMapper.type.modelProperties ||
+                {});
+            if (parentsRefs) {
+                parentsRefs.forEach(parentsRef => {
+                    listOfParents.push(parentsRef);
+                });
+            }
+        }
+        mapperParentMap.set(mapperClassName, listOfParents);
+    });
+    const modifiedList = traverse(mapperParentMap);
+    const { useCoreV2 } = (0, autorestSession_1.getAutorestOptions)();
+    const generatedMappers = new Map();
+    modifiedList.forEach(name => {
+        const arrayIndex = mapperPositionMap.get(name) || 0;
+        const mapper = mappers[arrayIndex];
         const mapperClassName = mapper.type.className;
         if (!mapperClassName) {
             logger_1.logger.warning(`Expected a mapper with a className, skipping generation`);
@@ -61,7 +119,7 @@ function writeMappers(sourceFile, { mappers }) {
         }
         const existingMapper = generatedMappers.get(mapperClassName);
         if (existingMapper) {
-            if (lodash_1.isEqual(existingMapper, mapper)) {
+            if ((0, lodash_1.isEqual)(existingMapper, mapper)) {
                 // If we already generated the same mapper, skip
                 return;
             }
@@ -71,7 +129,7 @@ function writeMappers(sourceFile, { mappers }) {
             isExported: true,
             declarations: [
                 {
-                    name: nameUtils_1.normalizeName(mapper.type.className || "MISSING_MAPPER", nameUtils_1.NameType.Class),
+                    name: (0, nameUtils_1.normalizeName)(mapper.type.className || "MISSING_MAPPER", nameUtils_1.NameType.Class),
                     type: !useCoreV2
                         ? "coreHttp.CompositeMapper"
                         : "coreClient.CompositeMapper",
@@ -81,6 +139,13 @@ function writeMappers(sourceFile, { mappers }) {
             declarationKind: ts_morph_1.VariableDeclarationKind.Const,
             leadingTrivia: writer => writer.blankLine()
         });
+        const { polymorphicDiscriminator } = mapper.type;
+        if (polymorphicDiscriminator) {
+            if ((0, lodash_1.isString)(polymorphicDiscriminator) &&
+                `${polymorphicDiscriminator}`.startsWith(mapper.serializedName)) {
+                sourceFile.addStatements(`${polymorphicDiscriminator}=${polymorphicDiscriminator};`);
+            }
+        }
         // Keep track of the mapper we just generated
         generatedMappers.set(mapperClassName, mapper);
     });
@@ -102,7 +167,7 @@ function writeDiscriminatorsMapping(sourceFile, clientDetails) {
         const { name: mapperName, discriminatorPath } = object;
         discriminatorMappers[discriminatorPath] = mapperName;
     });
-    if (!lodash_1.isEmpty(discriminatorMappers)) {
+    if (!(0, lodash_1.isEmpty)(discriminatorMappers)) {
         sourceFile.addVariableStatement({
             isExported: true,
             declarations: [
@@ -110,7 +175,7 @@ function writeDiscriminatorsMapping(sourceFile, clientDetails) {
                     name: "discriminators",
                     initializer: writer => {
                         writer.block(() => {
-                            lodash_1.keys(discriminatorMappers).forEach(key => {
+                            (0, lodash_1.keys)(discriminatorMappers).forEach(key => {
                                 writer.write(`'${key}': ${discriminatorMappers[key]},`);
                             });
                         });
@@ -138,7 +203,7 @@ function writeMapper(writer, mapper) {
             .write("type:")
             .block(() => {
             // Write tipe properties for the current mapper
-            writeMapperType(writer, mapper.type, parents);
+            writeMapperType(writer, mapper, parents);
         });
     });
 }
@@ -147,11 +212,12 @@ exports.writeMapper = writeMapper;
  * Figures out if the mapper type to generate is a Sequence or Composite
  * mapper type and generates it.
  */
-function writeMapperType(writer, mapperType, parents) {
+function writeMapperType(writer, mapper, parents) {
+    const mapperType = mapper.type;
     if (isSequenceMapperType(mapperType)) {
         return writeSequenceMapperType(writer, mapperType);
     }
-    return writeCompositeMapperType(writer, mapperType, parents);
+    return writeCompositeMapperType(writer, mapper, parents);
 }
 /**
  * Check if a MapperType is a SequenceMapperType
@@ -162,11 +228,17 @@ function isSequenceMapperType(mapperType) {
 /**
  * Generates the type content for a CompositeMapperType
  */
-function writeCompositeMapperType(writer, mapperType, parents) {
+function writeCompositeMapperType(writer, mapper, parents) {
+    const mapperType = mapper.type;
     const _a = mapperType, { modelProperties, polymorphicDiscriminator } = _a, restType = __rest(_a, ["modelProperties", "polymorphicDiscriminator"]);
     writeObjectProps(restType, writer);
     // Write type properties that need special handling
-    writePolymorphicDiscriminator(writer, polymorphicDiscriminator);
+    if (polymorphicDiscriminator) {
+        if (!(0, lodash_1.isString)(polymorphicDiscriminator) ||
+            !`${polymorphicDiscriminator}`.startsWith(mapper.serializedName)) {
+            writePolymorphicDiscriminator(writer, polymorphicDiscriminator);
+        }
+    }
     writeModelProperties(writer, parents, modelProperties);
 }
 /**
@@ -191,14 +263,16 @@ function writeMapperContraints(writer, constraints) {
         .write("constraints:")
         .block(() => {
         if (Pattern) {
-            writer.write(`Pattern: new RegExp("${Pattern.source.replace(/\\/g, "\\\\")}"), `);
+            writer.write(`Pattern: new RegExp("${Pattern.source
+                .replace(/\\/g, "\\\\")
+                .replace(/"/g, '\\"')}"), `);
         }
         writeObjectProps(restContstraints, writer);
     })
         .write(",");
 }
 function writeModelProperties(writer, parents = [], modelProperties = {}) {
-    if (lodash_1.isEmpty(parents) && lodash_1.isEmpty(modelProperties)) {
+    if ((0, lodash_1.isEmpty)(parents) && (0, lodash_1.isEmpty)(modelProperties)) {
         return writer;
     }
     return writer.write("modelProperties:").block(() => {
@@ -211,7 +285,7 @@ function writeModelProperties(writer, parents = [], modelProperties = {}) {
         writeParentMappers(parents, writer);
         // Write all sub-mappers
         if (modelProperties) {
-            lodash_1.keys(modelProperties).forEach(key => {
+            (0, lodash_1.keys)(modelProperties).forEach(key => {
                 writer.write(`"${key}":`);
                 writeMapper(writer, modelProperties[key]);
                 writer.write(",");
@@ -224,7 +298,7 @@ function writePolymorphicDiscriminator(writer, polymorphicDiscriminator) {
         return writer;
     }
     // When the discriminator is a string, we know it is a reference.
-    const isReferenceDicriminator = lodash_1.isString(polymorphicDiscriminator);
+    const isReferenceDicriminator = (0, lodash_1.isString)(polymorphicDiscriminator);
     writer.write("polymorphicDiscriminator:");
     if (isReferenceDicriminator) {
         // If the polymorphic discriminator is a reference, we just need to
@@ -242,8 +316,8 @@ function writePolymorphicDiscriminator(writer, polymorphicDiscriminator) {
     return writer.write(",");
 }
 function writeDefaultValue(writer, defaultValue, mapperType) {
-    if (!lodash_1.isNil(defaultValue)) {
-        return writer.write(`defaultValue: ${valueHelpers_1.getStringForValue(defaultValue, mapperType.name, true, mapperType)},`);
+    if (!(0, lodash_1.isNil)(defaultValue)) {
+        return writer.write(`defaultValue: ${(0, valueHelpers_1.getStringForValue)(defaultValue, mapperType.name, true, mapperType)},`);
     }
     return writer;
 }
@@ -254,7 +328,7 @@ function writeParentMappers(parents, writer) {
 }
 function writeObjectProps(obj, writer) {
     let currentPos = writer;
-    lodash_1.keys(obj).forEach(key => {
+    (0, lodash_1.keys)(obj).forEach(key => {
         currentPos = currentPos.writeLine(`${key}: ${JSON.stringify(obj[key])},`);
     });
     return currentPos;

package/dist/src/generators/mappersGenerator.js.map

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

package/dist/src/generators/modelsGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modelsGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/modelsGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EACL,OAAO,EAUR,MAAM,UAAU,CAAC;AAkClB,wBAAgB,cAAc,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,QA8B5E"}
+{"version":3,"file":"modelsGenerator.d.ts","sourceRoot":"","sources":["../../../src/generators/modelsGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EACL,OAAO,EAUR,MAAM,UAAU,CAAC;AAiClB,wBAAgB,cAAc,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,QA0C5E"}