@azure-tools/typespec-ts 0.14.0 → 0.15.0-alpha.20230822.1

package/dist/src/modular/emitModels.js

@@ -1,14 +1,20 @@
 import { getType } from "./helpers/typeHelpers.js";
 import * as path from "path";
+import { getDocsFromDescription } from "./helpers/docsHelpers.js";
+import { buildOperationOptions } from "./buildOperations.js";
 /**
  * This function creates the file containing all the models defined in TypeSpec
  */
 export function buildModels(codeModel, project, srcPath = "src", subfolder = "") {
-    var _a, _b, _c, _d, _e, _f;
-    const modelsFile = project.createSourceFile(path.join(`${srcPath}/src/`, subfolder, `models/models.ts`));
+    var _a, _b, _c, _d;
     // 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));
+    // Skip to generate models.ts if there is no any models
+    if (models.length === 0) {
+        return;
+    }
+    const modelsFile = project.createSourceFile(path.join(`${srcPath}/`, subfolder, `models/models.ts`));
     for (const model of codeModel.types) {
         if (model.type === "combined" && model.nullable) {
             for (const unionModel of (_a = model.types) !== null && _a !== void 0 ? _a : []) {
@@ -34,17 +40,17 @@ export function buildModels(codeModel, project, srcPath = "src", subfolder = "")
                 name: model.name,
                 isExported: true,
                 docs: [
-                    (_c = model.description) !== null && _c !== void 0 ? _c : "",
+                    ...getDocsFromDescription(model.description),
                     // If it is a fixed enum we don't need to list the known values in the docs as the
                     // output will be a literal union which is self documenting
                     model.isFixed
                         ? ""
                         : // When we generate an "extensible" enum, the type will be "string" so we list the known values
                             // in the docs for user reference.
-                            ((_d = model.values) !== null && _d !== void 0 ? _d : []).map((v) => `"${v.value}"`).join(", ")
+                            ((_c = model.values) !== null && _c !== void 0 ? _c : []).map((v) => `"${v.value}"`).join(", ")
                 ],
                 type: model.isFixed
-                    ? ((_e = model.values) !== null && _e !== void 0 ? _e : []).map((v) => `"${v.value}"`).join(" | ")
+                    ? ((_d = model.values) !== null && _d !== void 0 ? _d : []).map((v) => `"${v.value}"`).join(" | ")
                     : "string"
             });
         }
@@ -55,7 +61,7 @@ export function buildModels(codeModel, project, srcPath = "src", subfolder = "")
             modelsFile.addInterface({
                 name: model.name,
                 isExported: true,
-                docs: [(_f = model.description) !== null && _f !== void 0 ? _f : ""],
+                docs: getDocsFromDescription(model.description),
                 properties: properties.map((p) => {
                     const propertyMetadata = getType(p.type);
                     let propertyTypeName = propertyMetadata.name;
@@ -69,7 +75,7 @@ export function buildModels(codeModel, project, srcPath = "src", subfolder = "")
                     }
                     return {
                         name: `"${p.clientName}"`,
-                        docs: [p.description],
+                        docs: getDocsFromDescription(p.description),
                         hasQuestionToken: p.optional,
                         isReadonly: p.readonly,
                         type: propertyTypeName
@@ -98,4 +104,31 @@ function isAzureCoreError(t) {
         ["Error", "InnerError"].includes(t.name) &&
         t.isCoreErrorType === true);
 }
+export function buildModelsOptions(client, project, srcPath = "src", subfolder = "") {
+    const modelOptionsFile = project.createSourceFile(`${srcPath}/${subfolder}/models/options.ts`, undefined, {
+        overwrite: true
+    });
+    for (const operationGroup of client.operationGroups) {
+        operationGroup.operations.forEach((o) => {
+            buildOperationOptions(o, modelOptionsFile);
+        });
+    }
+    modelOptionsFile.addImportDeclarations([
+        {
+            moduleSpecifier: "@azure-rest/core-client",
+            namedImports: ["OperationOptions"]
+        }
+    ]);
+    modelOptionsFile.fixMissingImports();
+    modelOptionsFile
+        .getImportDeclarations()
+        .filter((id) => {
+        return (id.isModuleSpecifierRelative() &&
+            !id.getModuleSpecifierValue().endsWith(".js"));
+    })
+        .map((id) => {
+        id.setModuleSpecifier(id.getModuleSpecifierValue() + ".js");
+        return id;
+    });
+}
 //# sourceMappingURL=emitModels.js.map

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":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D;;GAEG;AACH,MAAM,UAAU,WAAW,CACzB,SAA2B,EAC3B,OAAgB,EAChB,UAAkB,KAAK,EACvB,YAAoB,EAAE;;IAEtB,+CAA+C;IAC/C,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAC1C,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,MAAM,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CACzE,CAAC;IAEF,uDAAuD;IACvD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO;KACR;IACD,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CACzC,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,EAAE,SAAS,EAAE,kBAAkB,CAAC,CACxD,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,KAAK,EAAE;QACnC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,KAAK,CAAC,QAAQ,EAAE;YAC/C,KAAK,MAAM,UAAU,IAAI,MAAA,KAAK,CAAC,KAAK,mCAAI,EAAE,EAAE;gBAC1C,IAAI,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE;oBAC/B,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;iBACzB;aACF;SACF;KACF;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,MAAM,UAAU,GAAG,MAAA,KAAK,CAAC,UAAU,mCAAI,EAAE,CAAC;QAC1C,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QACpC,IAAI,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC;QACjC,IAAI,YAAY,CAAC,QAAQ,KAAK,OAAO,EAAE;YACrC,QAAQ,GAAG,GAAG,QAAQ,IAAI,CAAC;SAC5B;QACD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;YACzB,IAAI,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,IAAK,CAAC,EAAE;gBACxC,+DAA+D;gBAC/D,SAAS;aACV;YACD,UAAU,CAAC,YAAY,CAAC;gBACtB,IAAI,EAAE,KAAK,CAAC,IAAK;gBACjB,UAAU,EAAE,IAAI;gBAChB,IAAI,EAAE;oBACJ,GAAG,sBAAsB,CAAC,KAAK,CAAC,WAAW,CAAC;oBAC5C,kFAAkF;oBAClF,2DAA2D;oBAC3D,KAAK,CAAC,OAAO;wBACX,CAAC,CAAC,EAAE;wBACJ,CAAC,CAAC,+FAA+F;4BAC/F,kCAAkC;4BAClC,CAAC,MAAA,KAAK,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;iBAC/D;gBACD,IAAI,EAAE,KAAK,CAAC,OAAO;oBACjB,CAAC,CAAC,CAAC,MAAA,KAAK,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;oBAC7D,CAAC,CAAC,QAAQ;aACb,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;gBACf,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;aAC5D;YACD,UAAU,CAAC,YAAY,CAAC;gBACtB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,UAAU,EAAE,IAAI;gBAChB,IAAI,EAAE,sBAAsB,CAAC,KAAK,CAAC,WAAW,CAAC;gBAC/C,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC/B,MAAM,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;oBACzC,IAAI,gBAAgB,GAAG,gBAAgB,CAAC,IAAI,CAAC;oBAC7C,IAAI,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;wBAC5B,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC;4BACzC,CAAC,CAAC,sBAAsB,CAAC,gBAAgB,CAAC;4BAC1C,CAAC,CAAC,gBAAgB,CAAC;qBACtB;oBACD,IAAI,gBAAgB,CAAC,QAAQ,KAAK,OAAO,EAAE;wBACzC,gBAAgB,GAAG,GAAG,gBAAgB,IAAI,CAAC;qBAC5C;oBACD,OAAO;wBACL,IAAI,EAAE,IAAI,CAAC,CAAC,UAAU,GAAG;wBACzB,IAAI,EAAE,sBAAsB,CAAC,CAAC,CAAC,WAAW,CAAC;wBAC3C,gBAAgB,EAAE,CAAC,CAAC,QAAQ;wBAC5B,UAAU,EAAE,CAAC,CAAC,QAAQ;wBACtB,IAAI,EAAE,gBAAgB;qBACvB,CAAC;gBACJ,CAAC,CAAC;aACH,CAAC,CAAC;SACJ;KACF;IAED,SAAS,sBAAsB,CAAC,IAAY;QAC1C,MAAM,cAAc,GAAW,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC;QACtE,eAAe,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACpC,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,IAAI,eAAe,CAAC,IAAI,GAAG,CAAC,EAAE;QAC5B,UAAU,CAAC,qBAAqB,CAAC;YAC/B;gBACE,eAAe,EAAE,yBAAyB;gBAC1C,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;aAC1C;SACF,CAAC,CAAC;KACJ;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,gBAAgB,CAAC,CAAO;IAC/B,OAAO,CACL,CAAC,CAAC,IAAI;QACN,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QACxC,CAAC,CAAC,eAAe,KAAK,IAAI,CAC3B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,MAAc,EACd,OAAgB,EAChB,UAAkB,KAAK,EACvB,YAAoB,EAAE;IAEtB,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAC/C,GAAG,OAAO,IAAI,SAAS,oBAAoB,EAC3C,SAAS,EACT;QACE,SAAS,EAAE,IAAI;KAChB,CACF,CAAC;IACF,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,eAAe,EAAE;QACnD,cAAc,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACtC,qBAAqB,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;KACJ;IACD,gBAAgB,CAAC,qBAAqB,CAAC;QACrC;YACE,eAAe,EAAE,yBAAyB;YAC1C,YAAY,EAAE,CAAC,kBAAkB,CAAC;SACnC;KACF,CAAC,CAAC;IAEH,gBAAgB,CAAC,iBAAiB,EAAE,CAAC;IACrC,gBAAgB;SACb,qBAAqB,EAAE;SACvB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;QACb,OAAO,CACL,EAAE,CAAC,yBAAyB,EAAE;YAC9B,CAAC,EAAE,CAAC,uBAAuB,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAC9C,CAAC;IACJ,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;QACV,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAC,uBAAuB,EAAE,GAAG,KAAK,CAAC,CAAC;QAC5D,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACP,CAAC"}

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,CAyB/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;AAIhD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,GACb,YAAY,CAAC,6BAA6B,CAAC,EAAE,CA0B/C"}

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

@@ -1,6 +1,8 @@
-import { getParameterType } from "./parameterHelpers.js";
+import { getType } from "./typeHelpers.js";
+import { getClientName } from "./namingHelpers.js";
 export function getClientParameters(client) {
-    const { name, parameters } = client;
+    const { parameters } = client;
+    const name = getClientName(client);
     const optionsParam = {
         name: "options",
         type: `${name}ClientOptions`,
@@ -13,7 +15,7 @@ export function getClientParameters(client) {
             .map((p) => {
             return {
                 name: p.clientName,
-                type: getParameterType(p)
+                type: getType(p.type).name
             };
         }),
         optionsParam

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,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"}
+{"version":3,"file":"clientHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/clientHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,UAAU,mBAAmB,CACjC,MAAc;IAEd,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAC9B,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACnC,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,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI;aAC3B,CAAC;QACJ,CAAC,CAAC;QACJ,YAAY;KACb,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}

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

@@ -0,0 +1,3 @@
+export declare function getFixmeForMultilineDocs(fixme: string[]): string[];
+export declare function getDocsFromDescription(description?: string): string[];
+//# sourceMappingURL=docsHelpers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"docsHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/docsHelpers.ts"],"names":[],"mappings":"AAAA,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAElE;AAED,wBAAgB,sBAAsB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAKrE"}

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

@@ -0,0 +1,10 @@
+export function getFixmeForMultilineDocs(fixme) {
+    return fixme.map((fixme) => ` @fixme ${fixme}`);
+}
+export function getDocsFromDescription(description) {
+    if (!description || description.trim().length === 0) {
+        return [];
+    }
+    return [description];
+}
+//# sourceMappingURL=docsHelpers.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"docsHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/docsHelpers.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,wBAAwB,CAAC,KAAe;IACtD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,KAAK,EAAE,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,WAAoB;IACzD,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE;QACnD,OAAO,EAAE,CAAC;KACX;IACD,OAAO,CAAC,WAAW,CAAC,CAAC;AACvB,CAAC"}

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

@@ -1,10 +1,17 @@
 import { FunctionDeclarationStructure, OptionalKind } from "ts-morph";
-import { Operation } from "../modularCodeModel.js";
-export declare function getSendPrivateFunction(operation: Operation, clientType: string): OptionalKind<FunctionDeclarationStructure>;
-export declare function getDeserializePrivateFunction(operation: Operation, needSubClient: boolean, needUnexpectedHelper: boolean): OptionalKind<FunctionDeclarationStructure>;
+import { ModularCodeModel, Operation, Property } from "../modularCodeModel.js";
+export declare function getSendPrivateFunction(operation: Operation, clientType: string, importSet: Map<string, Set<string>>): OptionalKind<FunctionDeclarationStructure>;
+export declare function getDeserializePrivateFunction(operation: Operation, needSubClient: boolean, needUnexpectedHelper: boolean, importSet: Map<string, Set<string>>): OptionalKind<FunctionDeclarationStructure>;
 /**
  * This operation builds and returns the function declaration for an operation.
  */
 export declare function getOperationFunction(operation: Operation, clientType: string): OptionalKind<FunctionDeclarationStructure>;
-export declare function getOperationOptionsName(operation: Operation): string;
+export declare function getOperationOptionsName(operation: Operation, includeGroupName?: boolean): string;
+/**
+ * This function helps translating an RLC response to an HLC response,
+ * extracting properties from body and headers and building the HLC response object
+ */
+export declare function getResponseMapping(properties: Property[], propertyPath: string | undefined, importSet: Map<string, Set<string>>): string[];
+export declare function hasLROOperation(codeModel: ModularCodeModel): boolean;
+export declare function hasPagingOperation(codeModel: ModularCodeModel): boolean;
 //# 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;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"}
+{"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,gBAAgB,EAChB,SAAS,EAET,QAAQ,EAET,MAAM,wBAAwB,CAAC;AAoChC,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,GAClC,YAAY,CAAC,4BAA4B,CAAC,CA6B5C;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,OAAO,EACtB,oBAAoB,EAAE,OAAO,EAC7B,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,GAClC,YAAY,CAAC,4BAA4B,CAAC,CAyE5C;AA6DD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,GACjB,YAAY,CAAC,4BAA4B,CAAC,CAmC5C;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,EACpB,gBAAgB,UAAQ,UAQzB;AAsWD;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,QAAQ,EAAE,EACtB,YAAY,oBAAwB,EACpC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,YAyEpC;AA8GD,wBAAgB,eAAe,CAAC,SAAS,EAAE,gBAAgB,WAQ1D;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,gBAAgB,WAS7D"}

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

@@ -2,7 +2,8 @@ import { toPascalCase } from "../../utils/casingUtils.js";
 import { buildType } from "./typeHelpers.js";
 import { NameType, getResponseBaseName, getResponseTypeName, normalizeName } from "@azure-tools/rlc-common";
 import { getOperationName } from "./namingHelpers.js";
-import { getFixmeForMultilineDocs } from "./fixmeHelpers.js";
+import { getFixmeForMultilineDocs, getDocsFromDescription } from "./docsHelpers.js";
+import { getCollectionFormatHelper, hasCollectionFormatInfo } from "../../utils/operationUtil.js";
 function getRLCResponseType(rlcResponse) {
     if (!(rlcResponse === null || rlcResponse === void 0 ? void 0 : rlcResponse.responses)) {
         return;
@@ -14,10 +15,7 @@ function getRLCResponseType(rlcResponse) {
         return (_a = resp.predefinedName) !== null && _a !== void 0 ? _a : getResponseTypeName(baseResponseName);
     }).join(" | ");
 }
-export function getSendPrivateFunction(operation, clientType) {
-    if (operation.name === "uploadTestFile") {
-        operation;
-    }
+export function getSendPrivateFunction(operation, clientType, importSet) {
     const parameters = getOperationSignatureParameters(operation, clientType);
     const { name } = getOperationName(operation);
     const functionStatement = {
@@ -30,13 +28,13 @@ export function getSendPrivateFunction(operation, clientType) {
     const operationPath = operation.url;
     const operationMethod = operation.method.toLowerCase();
     const statements = [];
-    statements.push(`return context.path("${operationPath}", ${getPathParameters(operation)}).${operationMethod}({...operationOptionsToRequestParameters(options), ${getRequestParameters(operation)}});`);
+    statements.push(`return context.path("${operationPath}", ${getPathParameters(operation)}).${operationMethod}({...operationOptionsToRequestParameters(options), ${getRequestParameters(operation, importSet)}});`);
     return {
         ...functionStatement,
         statements
     };
 }
-export function getDeserializePrivateFunction(operation, needSubClient, needUnexpectedHelper) {
+export function getDeserializePrivateFunction(operation, needSubClient, needUnexpectedHelper, importSet) {
     var _a, _b, _c, _d, _e;
     const { name } = getOperationName(operation);
     let parameters = [
@@ -77,10 +75,10 @@ export function getDeserializePrivateFunction(operation, needSubClient, needUnex
         statements.push(`return result.body`);
     }
     else if ((_c = response === null || response === void 0 ? void 0 : response.type) === null || _c === void 0 ? void 0 : _c.elementType) {
-        statements.push(`return ${deserializeResponseValue(response.type, "result.body")}`);
+        statements.push(`return ${deserializeResponseValue(response.type, "result.body", importSet, response.type.nullable !== undefined ? !response.type.nullable : false)}`);
     }
     else if ((_d = response === null || response === void 0 ? void 0 : response.type) === null || _d === void 0 ? void 0 : _d.properties) {
-        statements.push(`return {`, getResponseMapping((_e = response.type.properties) !== null && _e !== void 0 ? _e : []).join(","), `}`);
+        statements.push(`return {`, getResponseMapping((_e = response.type.properties) !== null && _e !== void 0 ? _e : [], "result.body", importSet).join(","), `}`);
     }
     else if (returnType.type === "void") {
         statements.push(`return;`);
@@ -145,7 +143,10 @@ export function getOperationFunction(operation, clientType) {
         : { name: "", type: "void" };
     const { name, fixme = [] } = getOperationName(operation);
     const functionStatement = {
-        docs: [operation.description, ...getFixmeForMultilineDocs(fixme)],
+        docs: [
+            ...getDocsFromDescription(operation.description),
+            ...getFixmeForMultilineDocs(fixme)
+        ],
         isAsync: true,
         isExported: true,
         name: normalizeName(operation.name, NameType.Operation, true),
@@ -162,15 +163,21 @@ export function getOperationFunction(operation, clientType) {
         statements
     };
 }
-export function getOperationOptionsName(operation) {
-    return `${toPascalCase(operation.groupName)}${toPascalCase(operation.name)}Options`;
+export function getOperationOptionsName(operation, includeGroupName = false) {
+    var _a;
+    const prefix = includeGroupName ? toPascalCase(operation.groupName) : "";
+    const optionName = `${prefix}${toPascalCase(operation.name)}Options`;
+    if (((_a = operation.bodyParameter) === null || _a === void 0 ? void 0 : _a.type.name) === optionName) {
+        return optionName.replace(/Options$/, "RequestOptions");
+    }
+    return optionName;
 }
 /**
  * This function build the request parameters that we will provide to the
  * RLC internally. This will translate High Level parameters into the RLC ones.
  * Figuring out what goes in headers, body, path and qsp.
  */
-function getRequestParameters(operation) {
+function getRequestParameters(operation, importSet) {
     if (!operation.parameters) {
         return "";
     }
@@ -183,7 +190,7 @@ function getRequestParameters(operation) {
     };
     for (const param of operationParameters) {
         if (param.location === "header" || param.location === "query") {
-            parametersImplementation[param.location].push(getParameterMap(param));
+            parametersImplementation[param.location].push(getParameterMap(param, importSet));
         }
     }
     let paramStr = "";
@@ -191,29 +198,40 @@ function getRequestParameters(operation) {
         paramStr = `${getContentTypeValue(contentTypeParameter)},`;
     }
     if (parametersImplementation.header.length) {
-        paramStr = `${paramStr}\nheaders: {${parametersImplementation.header.join(",\n") + ","},`;
+        paramStr = `${paramStr}\nheaders: {${parametersImplementation.header.join(",\n")}},`;
     }
     if (parametersImplementation.query.length) {
         paramStr = `${paramStr}\nqueryParameters: {${parametersImplementation.query.join(",\n")}},`;
     }
-    paramStr = `${paramStr}${buildBodyParameter(operation.bodyParameter)}`;
+    paramStr = `${paramStr}${buildBodyParameter(operation.bodyParameter, importSet)}`;
     return paramStr;
 }
-function buildBodyParameter(bodyParameter) {
-    var _a, _b;
+function buildBodyParameter(bodyParameter, importSet) {
+    var _a, _b, _c;
     if (!bodyParameter) {
         return "";
     }
     if (bodyParameter.type.type === "model") {
         const bodyParts = [];
         for (const param of (_b = (_a = bodyParameter === null || bodyParameter === void 0 ? void 0 : bodyParameter.type.properties) === null || _a === void 0 ? void 0 : _a.filter((p) => !p.readonly)) !== null && _b !== void 0 ? _b : []) {
-            bodyParts.push(getParameterMap(param));
+            if (param.type.type === "model" && isRequired(param)) {
+                bodyParts.push(`"${param.restApiName}": {${getRequestModelMapping(param.type, param.clientName, importSet).join(",\n")}}`);
+            }
+            else {
+                bodyParts.push(getParameterMap(param, importSet));
+            }
         }
         if (bodyParameter && bodyParameter.type.properties) {
             return `\nbody: {${bodyParts.join(",\n")}},`;
         }
     }
     if (bodyParameter.type.type === "list") {
+        if (((_c = bodyParameter.type.elementType) === null || _c === void 0 ? void 0 : _c.type) === "model") {
+            const bodyParts = getRequestModelMapping(bodyParameter.type.elementType, "p", importSet);
+            return `\nbody: (${bodyParameter.clientName} ?? []).map((p) => { return {
+        ${bodyParts.join(", ")}
+      };}),`;
+        }
         return `\nbody: ${bodyParameter.clientName},`;
     }
     if (bodyParameter.type.type === "byte-array") {
@@ -224,21 +242,35 @@ function buildBodyParameter(bodyParameter) {
 /**
  * This function helps with renames, translating client names to rest api names
  */
-function getParameterMap(param) {
+function getParameterMap(param, importSet) {
     if (isConstant(param)) {
         return getConstantValue(param);
     }
-    if (isOptionalWithouDefault(param)) {
-        return getOptionalWithoutDefault(param);
+    if (hasCollectionFormatInfo(param.location, param.format)) {
+        return getCollectionFormat(param);
     }
-    if (isOptionalWithDefault(param)) {
-        return getOptionalWithDefault(param);
+    // if the parameter or property is optional, we don't need to handle the default value
+    if (isOptional(param)) {
+        return getOptional(param, importSet);
     }
     if (isRequired(param)) {
-        return getRequired(param);
+        return getRequired(param, importSet);
     }
     throw new Error(`Parameter ${param.clientName} is not supported`);
 }
+function getCollectionFormat(param) {
+    var _a, _b;
+    const collectionInfo = getCollectionFormatHelper(param.location, (_a = param.format) !== null && _a !== void 0 ? _a : "");
+    if (!collectionInfo) {
+        throw "Has collection format info but without helper function detected";
+    }
+    const isMulti = ((_b = param.format) !== null && _b !== void 0 ? _b : "").toLowerCase() === "multi";
+    const additionalParam = isMulti ? `, "${param.restApiName}"` : "";
+    if (!param.optional) {
+        return `"${param.restApiName}": ${collectionInfo}(${param.clientName}${additionalParam})`;
+    }
+    return `"${param.restApiName}": options?.${param.clientName} !== undefined ? ${collectionInfo}(options?.${param.clientName}${additionalParam}): undefined`;
+}
 function isContentType(param) {
     return (param.location === "header" &&
         param.restApiName.toLowerCase() === "content-type");
@@ -259,7 +291,10 @@ function getContentTypeValue(param) {
 function isRequired(param) {
     return !param.optional;
 }
-function getRequired(param) {
+function getRequired(param, importSet) {
+    if (param.type.type === "model") {
+        return `"${param.restApiName}": ${getRequestModelMapping(param.type, param.clientName, importSet).join(",")}`;
+    }
     return `"${param.restApiName}": ${param.clientName}`;
 }
 function getConstantValue(param) {
@@ -273,25 +308,14 @@ function getConstantValue(param) {
 function isConstant(param) {
     return (param.type.type === "constant" && param.clientDefaultValue !== undefined);
 }
-function isOptionalWithouDefault(param) {
-    return Boolean(param.optional && !param.clientDefaultValue);
-}
-function getOptionalWithoutDefault(param) {
-    return `"${param.restApiName}": options?.${param.clientName}`;
-}
-function isOptionalWithDefault(param) {
-    return Boolean(param.clientDefaultValue);
+function isOptional(param) {
+    return Boolean(param.optional);
 }
-function getOptionalWithDefault(param) {
-    return `"${param.restApiName}": options.${param.clientName} ?? ${getQuotedValue(param)}`;
-}
-function getQuotedValue(param) {
-    if (param.type.type === "string") {
-        return `"${param.clientDefaultValue}"`;
-    }
-    else {
-        return param.clientDefaultValue;
+function getOptional(param, importSet) {
+    if (param.type.type === "model") {
+        return `"${param.restApiName}": {${getRequestModelMapping(param.type, "options?." + param.clientName + "?", importSet).join(", ")}}`;
     }
+    return `"${param.restApiName}": options?.${param.clientName}`;
 }
 /**
  * Builds the assignment for when a property or parameter has a default value
@@ -332,30 +356,81 @@ function getNullableCheck(name, type) {
     }
     return `${name} === null ? null :`;
 }
+/**
+ *
+ * This function helps translating an HLC request to RLC request,
+ * extracting properties from body and headers and building the RLC response object
+ */
+function getRequestModelMapping(modelPropertyType, propertyPath = "body", importSet) {
+    if (!modelPropertyType.properties || !modelPropertyType.properties) {
+        return [];
+    }
+    const props = [];
+    const properties = modelPropertyType.properties;
+    for (const property of properties) {
+        if (property.readonly) {
+            continue;
+        }
+        const propertyFullName = `${propertyPath}.${property.restApiName}`;
+        if (property.type.type === "model") {
+            let definition;
+            if (property.type.isCoreErrorType) {
+                definition = `"${property.restApiName}": ${getNullableCheck(propertyFullName, property.type)} ${!property.optional ? "" : `!${propertyFullName} ? undefined :`} ${propertyFullName}`;
+            }
+            else {
+                definition = `"${property.restApiName}": ${getNullableCheck(propertyFullName, property.type)} ${!property.optional ? "" : `!${propertyFullName} ? undefined :`} {${getRequestModelMapping(property.type, `${propertyPath}.${property.restApiName}${property.optional ? "?" : ""}`, importSet)}}`;
+            }
+            props.push(definition);
+        }
+        else {
+            const dot = propertyPath.endsWith("?") ? "." : "";
+            const restValue = `${propertyPath ? `${propertyPath}${dot}` : `${dot}`}["${property.clientName}"]`;
+            props.push(`"${property.restApiName}": ${serializeRequestValue(property.type, restValue, importSet)}`);
+        }
+    }
+    return props;
+}
 /**
  * This function helps translating an RLC response to an HLC response,
  * extracting properties from body and headers and building the HLC response object
  */
-function getResponseMapping(properties, propertyPath = "result.body") {
-    var _a;
+export function getResponseMapping(properties, propertyPath = "result.body", importSet) {
+    var _a, _b, _c;
     const props = [];
     for (const property of properties) {
         // TODO: Do we need to also add headers in the result type?
-        const propertyFullName = `${propertyPath}.${property.clientName}`;
+        const propertyFullName = `${propertyPath}.${property.restApiName}`;
         if (property.type.type === "model") {
             let definition;
             if (property.type.isCoreErrorType) {
-                definition = `"${property.restApiName}": ${getNullableCheck(propertyFullName, property.type)} ${!property.optional ? "" : `!${propertyFullName} ? undefined :`} ${propertyFullName}`;
+                definition = `"${property.clientName}": ${getNullableCheck(propertyFullName, property.type)} ${!property.optional ? "" : `!${propertyFullName} ? undefined :`} ${propertyFullName}`;
+            }
+            else if ((property.restApiName === "message" ||
+                property.restApiName === "messages") &&
+                (property.type.name === "ChatMessage" ||
+                    ((_a = property.type.elementType) === null || _a === void 0 ? void 0 : _a.name) === "ChatMessage")) {
+                definition = `"${property.clientName}": ${!property.optional
+                    ? `${propertyFullName} as any`
+                    : `!${propertyFullName} ? undefined : ${propertyFullName} as any`}`;
             }
             else {
-                definition = `"${property.restApiName}": ${getNullableCheck(propertyFullName, property.type)} ${!property.optional ? "" : `!${propertyFullName} ? undefined :`} {${getResponseMapping((_a = property.type.properties) !== null && _a !== void 0 ? _a : [], `${propertyPath}.${property.restApiName}${property.optional ? "?" : ""}`)}}`;
+                definition = `"${property.clientName}": ${getNullableCheck(propertyFullName, property.type)} ${!property.optional ? "" : `!${propertyFullName} ? undefined :`} {${getResponseMapping((_b = property.type.properties) !== null && _b !== void 0 ? _b : [], `${propertyPath}.${property.restApiName}${property.optional ? "?" : ""}`, importSet)}}`;
             }
             props.push(definition);
         }
         else {
             const dot = propertyPath.endsWith("?") ? "." : "";
             const restValue = `${propertyPath ? `${propertyPath}${dot}` : `${dot}`}["${property.restApiName}"]`;
-            props.push(`"${property.clientName}": ${deserializeResponseValue(property.type, restValue)}`);
+            if (property.restApiName === "messages" &&
+                (property.type.name === "ChatMessage" ||
+                    ((_c = property.type.elementType) === null || _c === void 0 ? void 0 : _c.name) === "ChatMessage")) {
+                props.push(`"${property.clientName}": ${!property.optional
+                    ? `${propertyFullName} as any`
+                    : `!${propertyFullName} ? undefined : ${propertyFullName} as any`}`);
+            }
+            else {
+                props.push(`"${property.clientName}": ${deserializeResponseValue(property.type, restValue, importSet, property.optional !== undefined ? !property.optional : false)}`);
+            }
         }
     }
     return props;
@@ -365,23 +440,69 @@ function getResponseMapping(properties, propertyPath = "result.body") {
  * We need to drill down into Array elements to make sure that the element type is
  * deserialized correctly
  */
-function deserializeResponseValue(type, restValue) {
-    var _a, _b, _c, _d, _e;
+function deserializeResponseValue(type, restValue, importSet, required) {
+    var _a, _b, _c, _d, _e, _f;
+    const coreUtilSet = importSet.get("@azure/core-util");
     switch (type.type) {
         case "datetime":
-            return `new Date(${restValue} ?? "")`;
-        case "byte-array":
-            return `Buffer.from(${restValue} ?? "")`;
+            return required
+                ? `new Date(${restValue})`
+                : `${restValue} !== undefined? new Date(${restValue}): undefined`;
+        case "combined":
+            return `${restValue} as any`;
         case "list":
             if (((_a = type.elementType) === null || _a === void 0 ? void 0 : _a.type) === "model") {
-                return `(${restValue} ?? []).map(p => ({${getResponseMapping((_c = (_b = type.elementType) === null || _b === void 0 ? void 0 : _b.properties) !== null && _c !== void 0 ? _c : [], "p")}}))`;
+                return `(${restValue} ?? []).map(p => ({${getResponseMapping((_c = (_b = type.elementType) === null || _b === void 0 ? void 0 : _b.properties) !== null && _c !== void 0 ? _c : [], "p", importSet)}}))`;
             }
             else if ((_e = (_d = type.elementType) === null || _d === void 0 ? void 0 : _d.properties) === null || _e === void 0 ? void 0 : _e.some((p) => needsDeserialize(p.type))) {
-                return `(${restValue} ?? []).map(p => ${deserializeResponseValue(type.elementType, "p")})`;
+                return `(${restValue} ?? []).map(p => ${deserializeResponseValue(type.elementType, "p", importSet, required)})`;
             }
             else {
                 return restValue;
             }
+        case "byte-array":
+            if (!coreUtilSet) {
+                importSet.set("@azure/core-util", new Set().add("stringToUint8Array"));
+            }
+            else {
+                coreUtilSet.add("stringToUint8Array");
+            }
+            return `typeof ${restValue} === 'string'
+      ? stringToUint8Array(${restValue}, "${(_f = type.format) !== null && _f !== void 0 ? _f : "base64"}")
+      : ${restValue}`;
+        default:
+            return restValue;
+    }
+}
+/**
+ * This function helps converting strings into JS complex types recursively.
+ * We need to drill down into Array elements to make sure that the element type is
+ * deserialized correctly
+ */
+function serializeRequestValue(type, restValue, importSet) {
+    var _a, _b, _c, _d;
+    const coreUtilSet = importSet.get("@azure/core-util");
+    switch (type.type) {
+        case "datetime":
+            return `${restValue} !== undefined ? new Date(${restValue}): undefined`;
+        case "list":
+            if (((_a = type.elementType) === null || _a === void 0 ? void 0 : _a.type) === "model") {
+                return `(${restValue} ?? []).map(p => ({${getRequestModelMapping(type.elementType, "p", importSet)}}))`;
+            }
+            else if ((_c = (_b = type.elementType) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c.some((p) => needsDeserialize(p.type))) {
+                return `(${restValue} ?? []).map(p => ${serializeRequestValue(type.elementType, "p", importSet)})`;
+            }
+            else {
+                return restValue;
+            }
+        case "byte-array":
+            if (!coreUtilSet) {
+                importSet.set("@azure/core-util", new Set().add("uint8ArrayToString"));
+            }
+            else {
+                coreUtilSet.add("uint8ArrayToString");
+            }
+            return `${restValue} !== undefined ? uint8ArrayToString(${restValue}, "${(_d = type.format) !== null && _d !== void 0 ? _d : "base64"}"): undefined`;
         default:
             return restValue;
     }
@@ -389,4 +510,24 @@ function deserializeResponseValue(type, restValue) {
 function needsDeserialize(type) {
     return (type === null || type === void 0 ? void 0 : type.type) === "datetime" || (type === null || type === void 0 ? void 0 : type.type) === "model";
 }
+export function hasLROOperation(codeModel) {
+    var _a;
+    return ((_a = codeModel.clients) !== null && _a !== void 0 ? _a : []).some((c) => {
+        var _a;
+        return ((_a = c.operationGroups) !== null && _a !== void 0 ? _a : []).some((og) => {
+            var _a;
+            return ((_a = og.operations) !== null && _a !== void 0 ? _a : []).some((op) => op.discriminator === "lro" || op.discriminator === "lropaging");
+        });
+    });
+}
+export function hasPagingOperation(codeModel) {
+    var _a;
+    return ((_a = codeModel.clients) !== null && _a !== void 0 ? _a : []).some((c) => {
+        var _a;
+        return ((_a = c.operationGroups) !== null && _a !== void 0 ? _a : []).some((og) => {
+            var _a;
+            return ((_a = og.operations) !== null && _a !== void 0 ? _a : []).some((op) => op.discriminator === "paging" || op.discriminator === "lropaging");
+        });
+    });
+}
 //# sourceMappingURL=operationHelpers.js.map