@azure-tools/typespec-ts 0.20.0 → 0.21.0-alpha.20240129.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.20.0",
+  "version": "0.21.0-alpha.20240129.1",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -21,9 +21,9 @@
     "ts-node": "~10.9.1",
     "typescript": "~5.2.0",
     "prettier": "^3.1.0",
-    "@azure-tools/cadl-ranch-specs": "^0.26.2",
-    "@azure-tools/cadl-ranch-expect": "^0.9.0",
-    "@azure-tools/cadl-ranch": "^0.10.0",
+    "@azure-tools/cadl-ranch-specs": "^0.28.7",
+    "@azure-tools/cadl-ranch-expect": "^0.11.0",
+    "@azure-tools/cadl-ranch": "^0.11.2",
     "chalk": "^4.0.0",
     "@azure-rest/core-client": "^1.1.6",
     "@azure/core-auth": "^1.3.2",
@@ -34,20 +34,26 @@
     "@azure/logger": "^1.0.4",
     "@azure/core-util": "^1.4.0",
     "eslint-plugin-require-extensions": "0.1.3",
-    "@typespec/ts-http-runtime": "1.0.0-alpha.20231129.4"
+    "@typespec/ts-http-runtime": "1.0.0-alpha.20231129.4",
+    "@azure-tools/typespec-azure-core": "0.37.2",
+    "@azure-tools/typespec-client-generator-core": "0.37.0",
+    "@typespec/compiler": "0.51.0",
+    "@typespec/http": "0.51.0",
+    "@typespec/rest": "0.51.0",
+    "@typespec/versioning": "0.51.0"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.36.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.36.1 <1.0.0",
-    "@typespec/compiler": ">=0.50.0 <1.0.0",
-    "@typespec/http": ">=0.50.0 <1.0.0",
-    "@typespec/rest": ">=0.50.0 <1.0.0",
-    "@typespec/versioning": ">=0.50.0 <1.0.0"
+    "@azure-tools/typespec-azure-core": ">=0.37.2 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.37.0 <1.0.0",
+    "@typespec/compiler": ">=0.51.0 <1.0.0",
+    "@typespec/http": ">=0.51.0 <1.0.0",
+    "@typespec/rest": ">=0.51.0 <1.0.0",
+    "@typespec/versioning": ">=0.51.0 <1.0.0"
   },
   "dependencies": {
     "prettier": "^3.1.0",
     "tslib": "^2.3.1",
-    "@azure-tools/rlc-common": "^0.20.0",
+    "@azure-tools/rlc-common": "^0.21.0",
     "ts-morph": "^15.1.0",
     "fs-extra": "^11.1.0"
   },
@@ -78,22 +84,26 @@
     "check-format": "npm run prettier -- --check",
     "prettier": "prettier --config ./.prettierrc src/**/*.ts",
     "check:tree": "node --loader ts-node/esm ./test/commands/check-clean-tree.ts",
-    "integration-test-ci": "npm run integration-test-ci:rlc && npm run integration-test-ci:modular && npm run integration-test-ci:non-branded",
-    "integration-test-ci:rlc": "npm run start-test-server:rlc & npm run copy:typespec && npm run generate-and-run:rlc",
-    "integration-test-ci:modular": "npm run start-test-server:modular & npm run copy:typespec && npm run generate-and-run:modular",
-    "integration-test-ci:non-branded": "npm run start-test-server & npm run copy:typespec && npm run generate-tsp-only:non-branded && npm run integration-test:alone:non-branded-rlc && npm run integration-test:alone:non-branded-modular && npm run stop-test-server",
+    "integration-test-ci": "npm run integration-test-ci:rlc && npm run integration-test-ci:modular && npm run integration-test-ci:non-branded-rlc && npm run integration-test-ci:non-branded-modular",
+    "integration-test-ci:rlc": "npm run start-test-server:rlc & npm run copy:typespec && npm run generate-and-run:rlc && npm run stop-test-server",
+    "integration-test-ci:modular": "npm run start-test-server:modular & npm run copy:typespec && npm run generate-and-run:modular && npm run stop-test-server",
+    "integration-test-ci:non-branded-rlc": "npm run start-test-server:non-branded-rlc & npm run copy:typespec && npm run generate-tsp-only:non-branded-rlc && npm run integration-test:alone:non-branded-rlc && npm run stop-test-server",
+    "integration-test-ci:non-branded-modular": "npm run start-test-server:non-branded-modular & npm run copy:typespec && npm run generate-tsp-only:non-branded-modular && npm run integration-test:alone:non-branded-modular && npm run stop-test-server",
     "start-test-server": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript.json",
-    "start-test-server:rlc": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript-rlc.json",
-    "start-test-server:modular": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript-modular.json",
+    "start-test-server:rlc": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript-rlc-azure.json",
+    "start-test-server:modular": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript-modular-azure.json",
+    "start-test-server:non-branded-rlc": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript-rlc-standard.json",
+    "start-test-server:non-branded-modular": "mkdirp -p coverage && npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http  --coverageFile ./coverage/cadl-ranch-coverage-typescript-modular-standard.json",
     "copy:typespec": "rm -rf temp && mkdirp -p temp && cp -r ./node_modules/@azure-tools/cadl-ranch-specs/* ./temp && cp -r ./test/integration/typespec/* ./temp/http",
     "generate-and-run:rlc": "npm run generate-tsp-only:rlc && npm run integration-test:alone:rlc && npm run stop-test-server",
     "generate-and-run:modular": "npm run generate-tsp-only:modular && npm run integration-test:alone:modular && npm run stop-test-server",
-    "generate-tsp-only": "npm run generate-tsp-only:rlc && npm run generate-tsp-only:modular",
+    "generate-tsp-only": "npm run generate-tsp-only:rlc && npm run generate-tsp-only:modular && npm run generate-tsp-only:non-branded-rlc && npm run generate-tsp-only:non-branded-modular",
     "generate-tsp-only:rlc": "node --loader ts-node/esm ./test/commands/gen-cadl-ranch.ts --tag=rlc",
     "generate-tsp-only:modular": "node --loader ts-node/esm ./test/commands/gen-cadl-ranch.ts --tag=modular",
     "generate-tsp-only:non-branded": "npm run generate-tsp-only:non-branded-rlc && npm run generate-tsp-only:non-branded-modular",
     "generate-tsp-only:non-branded-rlc": "node --loader ts-node/esm ./test/commands/gen-cadl-ranch.ts --tag=non-branded-rlc",
     "generate-tsp-only:non-branded-modular": "node --loader ts-node/esm ./test/commands/gen-cadl-ranch.ts --tag=non-branded-modular",
+    "regen-test-baselines": "npm run generate-tsp-only && npm run generate-tsp-only:non-branded",
     "integration-test:alone": "npm run integration-test:alone:rlc && npm run integration-test:alone:modular",
     "integration-test:alone:rlc": "cross-env TS_NODE_PROJECT=tsconfig.integration.json mocha -r ts-node/register --experimental-specifier-resolution=node --timeout 4000 ./test/integration/*.spec.ts",
     "integration-test:alone:modular": "cross-env TS_NODE_PROJECT=tsconfig.integration.json mocha -r ts-node/register --experimental-specifier-resolution=node --timeout 4000 ./test/modularIntegration/*.spec.ts",

package/src/modular/buildCodeModel.ts

@@ -103,10 +103,7 @@ import {
 import { SdkContext } from "../utils/interfaces.js";
 import { Project } from "ts-morph";
 import { buildRuntimeImports } from "@azure-tools/rlc-common";
-import {
-  getModelNamespaceName,
-  getOperationNamespaceInterfaceName
-} from "../utils/namespaceUtils.js";
+import { getModelNamespaceName } from "../utils/namespaceUtils.js";
 import { reportDiagnostic } from "../lib.js";
 import { getType as getTypeName } from "./helpers/typeHelpers.js";
 
@@ -277,6 +274,9 @@ function processModelProperties(
     if (!isSchemaProperty(context.program, property)) {
       continue;
     }
+    if (isNeverType(property.type)) {
+      continue;
+    }
     if (newValue.properties === undefined || newValue.properties === null) {
       newValue.properties = [];
     }
@@ -615,7 +615,8 @@ function emitOperation(
   context: SdkContext,
   operation: Operation,
   operationGroupName: string,
-  rlcModels: RLCModel
+  rlcModels: RLCModel,
+  hierarchies: string[]
 ): HrlcOperation {
   const isBranded = rlcModels.options?.branded ?? true;
   // Skip to extract paging and lro information for non-branded clients.
@@ -624,7 +625,8 @@ function emitOperation(
       context,
       operation,
       operationGroupName,
-      rlcModels
+      rlcModels,
+      hierarchies
     );
   }
   const lro = isLongRunningOperation(
@@ -655,19 +657,33 @@ function emitOperation(
       context,
       operation,
       operationGroupName,
-      rlcModels
+      rlcModels,
+      hierarchies
     );
   } else if (paging) {
     return emitPagingOperation(
       context,
       operation,
       operationGroupName,
-      rlcModels
+      rlcModels,
+      hierarchies
     );
   } else if (lro) {
-    return emitLroOperation(context, operation, operationGroupName, rlcModels);
+    return emitLroOperation(
+      context,
+      operation,
+      operationGroupName,
+      rlcModels,
+      hierarchies
+    );
   }
-  return emitBasicOperation(context, operation, operationGroupName, rlcModels);
+  return emitBasicOperation(
+    context,
+    operation,
+    operationGroupName,
+    rlcModels,
+    hierarchies
+  );
 }
 
 function addLroInformation(emittedOperation: HrlcOperation) {
@@ -694,13 +710,15 @@ function emitLroPagingOperation(
   context: SdkContext,
   operation: Operation,
   operationGroupName: string,
-  rlcModels: RLCModel
+  rlcModels: RLCModel,
+  hierarchies: string[]
 ): HrlcOperation {
   const emittedOperation = emitBasicOperation(
     context,
     operation,
     operationGroupName,
-    rlcModels
+    rlcModels,
+    hierarchies
   );
   addLroInformation(emittedOperation);
   addPagingInformation(context.program, operation, emittedOperation);
@@ -712,13 +730,15 @@ function emitLroOperation(
   context: SdkContext,
   operation: Operation,
   operationGroupName: string,
-  rlcModels: RLCModel
+  rlcModels: RLCModel,
+  hierarchies: string[]
 ): HrlcOperation {
   const emittedOperation = emitBasicOperation(
     context,
     operation,
     operationGroupName,
-    rlcModels
+    rlcModels,
+    hierarchies
   );
   addLroInformation(emittedOperation);
   return emittedOperation;
@@ -728,13 +748,15 @@ function emitPagingOperation(
   context: SdkContext,
   operation: Operation,
   operationGroupName: string,
-  rlcModels: RLCModel
+  rlcModels: RLCModel,
+  hierarchies: string[]
 ): HrlcOperation {
   const emittedOperation = emitBasicOperation(
     context,
     operation,
     operationGroupName,
-    rlcModels
+    rlcModels,
+    hierarchies
   );
   addPagingInformation(context.program, operation, emittedOperation);
   return emittedOperation;
@@ -744,7 +766,8 @@ function emitBasicOperation(
   context: SdkContext,
   operation: Operation,
   operationGroupName: string,
-  rlcModels: RLCModel
+  rlcModels: RLCModel,
+  hierarchies: string[]
 ): HrlcOperation {
   // Set up parameters for operation
   const parameters: any[] = [];
@@ -782,9 +805,7 @@ function emitBasicOperation(
   });
 
   const namespaceHierarchies =
-    context.rlcOptions?.hierarchyClient === true
-      ? getOperationNamespaceInterfaceName(context, operation)
-      : [];
+    context.rlcOptions?.hierarchyClient === true ? hierarchies : [];
 
   if (
     namespaceHierarchies.length === 0 &&
@@ -1167,6 +1188,16 @@ function emitStdScalar(
       return { type: "duration", format: newScalar.format };
     case "numeric":
       return {}; // Waiting on design for more precise type https://github.com/microsoft/cadl/issues/1260
+    case "decimal":
+    case "decimal128":
+      reportDiagnostic(program, {
+        code: "decimal-to-number",
+        format: {
+          propertyName: newScalar?.name ?? ""
+        },
+        target: newScalar ?? scalar
+      });
+      return { type: "integer", format: newScalar.format };
     default:
       return {};
   }
@@ -1479,26 +1510,40 @@ function emitOperationGroups(
     string,
     OperationGroup
   >();
-  for (const operationGroup of listOperationGroups(context, client)) {
+  const clientOperations: HrlcOperation[] = [];
+  for (const operation of listOperationsInOperationGroup(context, client)) {
+    clientOperations.push(emitOperation(context, operation, "", rlcModels, []));
+  }
+  if (clientOperations.length > 0) {
+    addHierarchyOperationGroup(clientOperations, groupMapping);
+  }
+  for (const operationGroup of listOperationGroups(context, client, true)) {
     const operations: HrlcOperation[] = [];
-    const name = operationGroup.type.name;
+    const name =
+      context.rlcOptions?.hierarchyClient ||
+      context.rlcOptions?.enableOperationGroup
+        ? operationGroup.type.name
+        : "";
+    const hierarchies =
+      context.rlcOptions?.hierarchyClient ||
+      context.rlcOptions?.enableOperationGroup
+        ? operationGroup.groupPath.split(".")
+        : [];
+    if (hierarchies[0]?.endsWith("Client")) {
+      hierarchies.shift();
+    }
     for (const operation of listOperationsInOperationGroup(
       context,
       operationGroup
     )) {
-      operations.push(emitOperation(context, operation, name, rlcModels));
+      operations.push(
+        emitOperation(context, operation, name, rlcModels, hierarchies)
+      );
     }
     if (operations.length > 0) {
       addHierarchyOperationGroup(operations, groupMapping);
     }
   }
-  const clientOperations: HrlcOperation[] = [];
-  for (const operation of listOperationsInOperationGroup(context, client)) {
-    clientOperations.push(emitOperation(context, operation, "", rlcModels));
-  }
-  if (clientOperations.length > 0) {
-    addHierarchyOperationGroup(clientOperations, groupMapping);
-  }
 
   groupMapping.forEach((value) => {
     operationGroups.push(value);

package/src/modular/buildProjectFiles.ts

@@ -223,7 +223,7 @@ function emitNonBrandedPackage(codeModel: ModularCodeModel) {
       prettier: "^3.1.0",
       rimraf: "^5.0.0",
       "source-map-support": "^0.5.9",
-      typescript: "~5.2.0",
+      typescript: "~5.3.3",
       "@rollup/plugin-commonjs": "^24.0.0",
       "@rollup/plugin-json": "^6.0.0",
       "@rollup/plugin-multi-entry": "^6.0.0",
@@ -329,7 +329,7 @@ function emitBrandedPackage(
       prettier: "^3.1.0",
       rimraf: "^5.0.0",
       "source-map-support": "^0.5.9",
-      typescript: "~5.2.0"
+      typescript: "~5.3.3"
     }
   } as any;
 

package/src/modular/helpers/operationHelpers.ts

@@ -157,20 +157,21 @@ export function getDeserializePrivateFunction(
     }
   }
 
+  const allParents = getAllAncestors(response.type);
+  const properties = getAllProperties(response.type, allParents) ?? [];
+
   if (
     response?.type?.type === "any" ||
     response.isBinaryPayload ||
     response?.type?.aliasType
   ) {
     statements.push(`return result.body`);
-  } else if (getAllProperties(response?.type).length > 0) {
+  } else if (properties.length > 0) {
     statements.push(
       `return {`,
-      getResponseMapping(
-        getAllProperties(response.type) ?? [],
-        "result.body",
-        runtimeImports
-      ).join(","),
+      getResponseMapping(response.type, "result.body", runtimeImports).join(
+        ","
+      ),
       `}`
     );
   } else if (returnType.type === "void") {
@@ -182,6 +183,7 @@ export function getDeserializePrivateFunction(
         "result.body",
         runtimeImports,
         response.type.nullable !== undefined ? !response.type.nullable : false,
+        [response.type],
         response.type.format
       )}`
     );
@@ -449,11 +451,14 @@ function buildBodyParameter(
     const bodyParts: string[] = getRequestModelMapping(
       bodyParameter.type,
       bodyParameter.clientName,
-      runtimeImports
+      runtimeImports,
+      [bodyParameter.type]
     );
 
     if (bodyParameter && bodyParts.length > 0) {
       return `\nbody: {${bodyParts.join(",\n")}},`;
+    } else if (bodyParameter && bodyParts.length === 0) {
+      return `\nbody: ${bodyParameter.clientName},`;
     }
   } else if (
     bodyParameter.type.type === "model" &&
@@ -470,7 +475,8 @@ function buildBodyParameter(
       const bodyParts = getRequestModelMapping(
         bodyParameter.type.elementType,
         "p",
-        runtimeImports
+        runtimeImports,
+        [bodyParameter.type.elementType]
       );
       return `\nbody: (${bodyParameter.clientName} ?? []).map((p) => { return {
         ${bodyParts.join(", ")}
@@ -553,6 +559,7 @@ function getCollectionFormat(param: Parameter, runtimeImports: RuntimeImports) {
       param.clientName,
       runtimeImports,
       true,
+      [param.type],
       param.format
     )}${additionalParam})`;
   }
@@ -563,6 +570,7 @@ function getCollectionFormat(param: Parameter, runtimeImports: RuntimeImports) {
     "options?." + param.clientName,
     runtimeImports,
     false,
+    [param.type],
     param.format
   )}${additionalParam}): undefined`;
 }
@@ -602,7 +610,8 @@ function getRequired(param: RequiredType, runtimeImports: RuntimeImports) {
     return `"${param.restApiName}": {${getRequestModelMapping(
       param.type,
       param.clientName,
-      runtimeImports
+      runtimeImports,
+      [param.type]
     ).join(",")}}`;
   }
   return `"${param.restApiName}": ${serializeRequestValue(
@@ -610,6 +619,7 @@ function getRequired(param: RequiredType, runtimeImports: RuntimeImports) {
     param.clientName,
     runtimeImports,
     true,
+    [param.type],
     param.format === undefined &&
       (param as Parameter).location === "header" &&
       param.type.type === "datetime"
@@ -654,7 +664,8 @@ function getOptional(param: OptionalType, runtimeImports: RuntimeImports) {
     return `"${param.restApiName}": {${getRequestModelMapping(
       param.type,
       "options?." + param.clientName + "?",
-      runtimeImports
+      runtimeImports,
+      [param.type]
     ).join(", ")}}`;
   }
   return `"${param.restApiName}": ${serializeRequestValue(
@@ -662,6 +673,7 @@ function getOptional(param: OptionalType, runtimeImports: RuntimeImports) {
     `options?.${param.clientName}`,
     runtimeImports,
     false,
+    [param.type],
     param.format === undefined &&
       (param as Parameter).location === "header" &&
       param.type.type === "datetime"
@@ -729,13 +741,16 @@ function getNullableCheck(name: string, type: Type) {
 function getRequestModelMapping(
   modelPropertyType: Type,
   propertyPath: string = "body",
-  runtimeImports: RuntimeImports
+  runtimeImports: RuntimeImports,
+  typeStack: Type[] = []
 ) {
-  if (getAllProperties(modelPropertyType).length <= 0) {
+  const props: string[] = [];
+  const allParents = getAllAncestors(modelPropertyType);
+  const properties: Property[] =
+    getAllProperties(modelPropertyType, allParents) ?? [];
+  if (properties.length <= 0) {
     return [];
   }
-  const props: string[] = [];
-  const properties: Property[] = getAllProperties(modelPropertyType) ?? [];
   for (const property of properties) {
     if (property.readonly) {
       continue;
@@ -750,12 +765,7 @@ function getRequestModelMapping(
         )} ${
           !property.optional ? "" : `!${propertyFullName} ? undefined :`
         } ${propertyFullName}`;
-      } else if (
-        (property.restApiName === "message" ||
-          property.restApiName === "messages") &&
-        (property.type.name === "ChatMessage" ||
-          property.type.elementType?.name === "ChatMessage")
-      ) {
+      } else if (typeStack.includes(property.type)) {
         definition = `"${property.restApiName}": ${
           !property.optional
             ? `${propertyFullName} as any`
@@ -772,17 +782,13 @@ function getRequestModelMapping(
           `${propertyPath}.${property.clientName}${
             property.optional ? "?" : ""
           }`,
-          runtimeImports
+          runtimeImports,
+          [...typeStack, property.type]
         )}}`;
       }
 
       props.push(definition);
-    } else if (
-      (property.restApiName === "message" ||
-        property.restApiName === "messages") &&
-      (property.type.name === "ChatMessage" ||
-        property.type.elementType?.name === "ChatMessage")
-    ) {
+    } else if (typeStack.includes(property.type)) {
       const definition = `"${property.restApiName}": ${
         !property.optional
           ? `${propertyFullName} as any`
@@ -800,6 +806,7 @@ function getRequestModelMapping(
           clientValue,
           runtimeImports,
           !property.optional,
+          [...typeStack, property.type],
           property.format
         )}`
       );
@@ -814,10 +821,16 @@ function getRequestModelMapping(
  * extracting properties from body and headers and building the HLC response object
  */
 export function getResponseMapping(
-  properties: Property[],
+  type: Type,
   propertyPath: string = "result.body",
-  runtimeImports: RuntimeImports
+  runtimeImports: RuntimeImports,
+  typeStack: Type[] = []
 ) {
+  const allParents = getAllAncestors(type);
+  const properties = getAllProperties(type, allParents) ?? [];
+  if (typeStack.length <= 0) {
+    typeStack.push(type);
+  }
   const props: string[] = [];
   for (const property of properties) {
     // TODO: Do we need to also add headers in the result type?
@@ -831,12 +844,7 @@ export function getResponseMapping(
         )} ${
           !property.optional ? "" : `!${propertyFullName} ? undefined :`
         } ${propertyFullName}`;
-      } else if (
-        (property.restApiName === "message" ||
-          property.restApiName === "messages") &&
-        (property.type.name === "ChatMessage" ||
-          property.type.elementType?.name === "ChatMessage")
-      ) {
+      } else if (typeStack.includes(property.type)) {
         definition = `"${property.clientName}": ${
           !property.optional
             ? `${propertyFullName} as any`
@@ -849,11 +857,12 @@ export function getResponseMapping(
         )} ${
           !property.optional ? "" : `!${propertyFullName} ? undefined :`
         } {${getResponseMapping(
-          getAllProperties(property.type) ?? [],
+          property.type,
           `${propertyPath}.${property.restApiName}${
             property.optional ? "?" : ""
           }`,
-          runtimeImports
+          runtimeImports,
+          [...typeStack, property.type]
         )}}`;
       }
 
@@ -863,12 +872,7 @@ export function getResponseMapping(
       const restValue = `${
         propertyPath ? `${propertyPath}${dot}` : `${dot}`
       }["${property.restApiName}"]`;
-      if (
-        (property.restApiName === "message" ||
-          property.restApiName === "messages") &&
-        (property.type.name === "ChatMessage" ||
-          property.type.elementType?.name === "ChatMessage")
-      ) {
+      if (typeStack.includes(property.type)) {
         props.push(
           `"${property.clientName}": ${
             !property.optional
@@ -883,6 +887,7 @@ export function getResponseMapping(
             restValue,
             runtimeImports,
             property.optional !== undefined ? !property.optional : false,
+            [...typeStack, property.type],
             property.format
           )}`
         );
@@ -890,6 +895,7 @@ export function getResponseMapping(
     }
   }
 
+  typeStack.pop();
   return props;
 }
 
@@ -903,6 +909,7 @@ function deserializeResponseValue(
   restValue: string,
   runtimeImports: RuntimeImports,
   required: boolean,
+  typeStack: Type[] = [],
   format?: string
 ): string {
   switch (type.type) {
@@ -922,9 +929,10 @@ function deserializeResponseValue(
       if (type.elementType?.type === "model") {
         if (!type.elementType.aliasType) {
           return `${prefix}.map(p => ({${getResponseMapping(
-            getAllProperties(type.elementType) ?? [],
+            type.elementType,
             "p",
-            runtimeImports
+            runtimeImports,
+            [...typeStack, type.elementType]
           )}}))`;
         }
         return `${prefix}`;
@@ -936,7 +944,8 @@ function deserializeResponseValue(
           type.elementType!,
           "p",
           runtimeImports,
-          required,
+          true,
+          [...typeStack, type.elementType!],
           type.elementType?.format
         )})`;
       } else {
@@ -966,6 +975,7 @@ function serializeRequestValue(
   clientValue: string,
   runtimeImports: RuntimeImports,
   required: boolean,
+  typeStack: Type[] = [],
   format?: string
 ): string {
   switch (type.type) {
@@ -993,7 +1003,8 @@ function serializeRequestValue(
         return `${prefix}.map(p => ({${getRequestModelMapping(
           type.elementType,
           "p",
-          runtimeImports
+          runtimeImports,
+          [...typeStack, type.elementType]
         )}}))`;
       } else if (
         needsDeserialize(type.elementType) &&
@@ -1004,6 +1015,7 @@ function serializeRequestValue(
           "p",
           runtimeImports,
           required,
+          [...typeStack, type.elementType!],
           type.elementType?.format
         )})`;
       } else {
@@ -1070,12 +1082,12 @@ export function isPagingOperation(op: Operation): boolean {
   return op.discriminator === "paging" || op.discriminator === "lropaging";
 }
 
-function getAllProperties(type: Type): Property[] {
+export function getAllProperties(type: Type, parents?: Type[]): Property[] {
   const propertiesMap: Map<string, Property> = new Map();
   if (!type) {
     return [];
   }
-  type.parents?.forEach((p) => {
+  parents?.forEach((p) => {
     getAllProperties(p).forEach((prop) => {
       propertiesMap.set(prop.clientName, prop);
     });
@@ -1085,3 +1097,12 @@ function getAllProperties(type: Type): Property[] {
   });
   return [...propertiesMap.values()];
 }
+
+function getAllAncestors(type: Type): Type[] {
+  const ancestors: Type[] = [];
+  type?.parents?.forEach((p) => {
+    ancestors.push(p);
+    ancestors.push(...getAllAncestors(p));
+  });
+  return ancestors;
+}

package/src/modular/helpers/typeHelpers.ts

@@ -101,6 +101,9 @@ export function getType(type: Type, format?: string): TypeMetadata {
     case "dict":
       return handleDictType(type);
 
+    case "never": 
+      return { name: "never", nullable: type.nullable };
+
     default:
       throw new Error(`Unsupported type ${type.type}`);
   }

package/src/modular/modularCodeModel.ts

@@ -83,7 +83,8 @@ export interface Type {
     | "dict"
     | "combined"
     | "any"
-    | "unknown";
+    | "unknown"
+    | "never";
   policy?: Policy;
   apiVersions?: any[];
   clientDefaultValue?: any;