@azure-tools/typespec-ts 0.19.0 → 0.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -10,7 +10,6 @@
     "@types/chai": "^4.3.1",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.0.0",
-    "@types/prettier": "^2.6.0",
     "@types/fs-extra": "^9.0.13",
     "@typescript-eslint/eslint-plugin": "^6.8.0",
     "@typescript-eslint/parser": "^6.8.0",
@@ -21,12 +20,12 @@
     "rimraf": "^5.0.0",
     "ts-node": "~10.9.1",
     "typescript": "~5.2.0",
-    "prettier": "~2.7.1",
-    "@azure-tools/cadl-ranch-specs": "^0.24.0",
-    "@azure-tools/cadl-ranch-expect": "^0.8.0",
-    "@azure-tools/cadl-ranch": "^0.9.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",
     "chalk": "^4.0.0",
-    "@azure-rest/core-client": "^1.1.4",
+    "@azure-rest/core-client": "^1.1.6",
     "@azure/core-auth": "^1.3.2",
     "cross-env": "^7.0.3",
     "@azure/core-paging": "^1.5.0",
@@ -35,20 +34,20 @@
     "@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.20231103.1"
+    "@typespec/ts-http-runtime": "1.0.0-alpha.20231129.4"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.35.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.35.0 <1.0.0",
-    "@typespec/compiler": ">=0.49.0 <1.0.0",
-    "@typespec/http": ">=0.49.0 <1.0.0",
-    "@typespec/rest": ">=0.49.0 <1.0.0",
-    "@typespec/versioning": ">=0.49.0 <1.0.0"
+    "@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"
   },
   "dependencies": {
-    "prettier": "^2.6.1",
+    "prettier": "^3.1.0",
     "tslib": "^2.3.1",
-    "@azure-tools/rlc-common": "^0.19.0",
+    "@azure-tools/rlc-common": "^0.20.0",
     "ts-morph": "^15.1.0",
     "fs-extra": "^11.1.0"
   },
@@ -78,7 +77,7 @@
     "format": "npm run -s prettier -- --write",
     "check-format": "npm run prettier -- --check",
     "prettier": "prettier --config ./.prettierrc src/**/*.ts",
-    "check:tree": "ts-node ./test/commands/check-clean-tree.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",
@@ -93,8 +92,8 @@
     "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": "ts-node ./test/commands/gen-cadl-ranch.ts --tag=non-branded-rlc",
-    "generate-tsp-only:non-branded-modular": "ts-node ./test/commands/gen-cadl-ranch.ts --tag=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",
     "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/index.ts

@@ -17,7 +17,7 @@ import {
   buildApiExtractorConfig,
   buildPackageFile,
   buildPollingHelper,
-  buildPaginateHelper,
+  buildPaginateHelper as buildRLCPaginateHelper,
   buildEsLintConfig,
   buildKarmaConfigFile,
   buildEnvFile,
@@ -54,6 +54,10 @@ import { GenerationDirDetail, SdkContext } from "./utils/interfaces.js";
 import { transformRLCOptions } from "./transform/transfromRLCOptions.js";
 import { ModularCodeModel } from "./modular/modularCodeModel.js";
 import { getClientName } from "@azure-tools/rlc-common";
+import {
+  buildPagingTypes,
+  buildPagingHelpers as buildModularPagingHelpers
+} from "./modular/buildPagingFiles.js";
 
 export * from "./lib.js";
 
@@ -61,7 +65,10 @@ export async function $onEmit(context: EmitContext) {
   /** Shared status */
   const program: Program = context.program;
   const emitterOptions: RLCOptions = context.options;
-  const dpgContext = createSdkContext(context) as SdkContext;
+  const dpgContext = createSdkContext(
+    context,
+    "@azure-tools/typespec-ts"
+  ) as SdkContext;
   const needUnexpectedHelper: Map<string, boolean> = new Map<string, boolean>();
   const serviceNameToRlcModelsMap: Map<string, RLCModel> = new Map<
     string,
@@ -136,7 +143,7 @@ export async function $onEmit(context: EmitContext) {
       await emitContentByBuilder(program, buildIndexFile, rlcModels);
       await emitContentByBuilder(program, buildLogger, rlcModels);
       await emitContentByBuilder(program, buildTopLevelIndex, rlcModels);
-      await emitContentByBuilder(program, buildPaginateHelper, rlcModels);
+      await emitContentByBuilder(program, buildRLCPaginateHelper, rlcModels);
       await emitContentByBuilder(program, buildPollingHelper, rlcModels);
       await emitContentByBuilder(program, buildSerializeHelper, rlcModels);
       await emitContentByBuilder(
@@ -170,11 +177,20 @@ export async function $onEmit(context: EmitContext) {
           overwrite: true
         }
       );
+
+      const isMultiClients = modularCodeModel.clients.length > 1;
       for (const subClient of modularCodeModel.clients) {
         buildModels(modularCodeModel, subClient);
         buildModelsOptions(modularCodeModel, subClient);
         const hasClientUnexpectedHelper =
           needUnexpectedHelper.get(subClient.rlcClientName) ?? false;
+        buildPagingTypes(modularCodeModel, subClient);
+        buildModularPagingHelpers(
+          modularCodeModel,
+          subClient,
+          hasClientUnexpectedHelper,
+          isMultiClients
+        );
         buildOperationFiles(
           dpgContext,
           modularCodeModel,
@@ -197,7 +213,7 @@ export async function $onEmit(context: EmitContext) {
           exportIndex: true,
           interfaceOnly: true
         });
-        if (modularCodeModel.clients.length > 1) {
+        if (isMultiClients) {
           buildSubClientIndexFile(modularCodeModel, subClient);
         }
         buildRootIndex(modularCodeModel, subClient, rootIndexFile);

package/src/lib.ts

@@ -192,6 +192,24 @@ const libDef = {
         default:
           "Required header cannot be nullable. Please remove the nullable modifier."
       }
+    },
+    "no-paging-items-defined": {
+      severity: "warning",
+      messages: {
+        default: paramMessage`Please specify @items property for the paging operation - ${"operationName"}.`
+      }
+    },
+    "decimal-to-number": {
+      severity: "warning",
+      messages: {
+        default: paramMessage`Please note the decimal type will be converted to number. If you strongly care about precision you can use @encode to encode it as a string for the property - ${"propertyName"}.`
+      }
+    },
+    "unable-serialized-type": {
+      severity: "warning",
+      messages: {
+        default: paramMessage`Please note the header ${"type"} is not serializable.`
+      }
     }
   },
   emitter: {

package/src/modular/buildClassicalClient.ts

@@ -155,6 +155,21 @@ function importAllModels(
     moduleSpecifier: `./models/options.js`,
     namedImports: exportedOptions
   });
+
+  const pagingTypes = project.getSourceFile(
+    `${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}models/pagingTypes.ts`
+  );
+
+  if (!pagingTypes) {
+    return;
+  }
+
+  const exportedPaingTypes = [...pagingTypes.getExportedDeclarations().keys()];
+
+  clientFile.addImportDeclaration({
+    moduleSpecifier: `./models/pagingTypes.js`,
+    namedImports: exportedPaingTypes
+  });
 }
 
 function importPipeline(

package/src/modular/buildClassicalOperationGroups.ts

@@ -7,7 +7,7 @@ import { NameType } from "@azure-tools/rlc-common";
 import { getClassicalOperation } from "./helpers/classicalOperationHelpers.js";
 import { getClassicalLayerPrefix } from "./helpers/namingHelpers.js";
 import { SourceFile } from "ts-morph";
-import { importModels } from "./buildOperations.js";
+import { importModels, importPagingDependencies } from "./buildOperations.js";
 
 export function buildClassicOperationFiles(
   codeModel: ModularCodeModel,
@@ -52,6 +52,14 @@ export function buildClassicOperationFiles(
         operationGroup.namespaceHierarchies.length
       );
       importApis(classicFile, client, codeModel, operationGroup);
+      // We need to import the paging helpers and types explicitly because ts-morph may not be able to find them.
+      importPagingDependencies(
+        srcPath,
+        classicFile,
+        codeModel.project,
+        subfolder,
+        operationGroup.namespaceHierarchies.length
+      );
       classicFile.fixMissingImports();
       classicFile.fixUnusedIdentifiers();
       classicOperationFiles.set(classicOperationFileName, classicFile);
@@ -91,6 +99,14 @@ export function buildClassicOperationFiles(
         // We SHOULD keep this because otherwise ts-morph will "helpfully" try to import models from the rest layer when we call fixMissingImports().
         importModels(srcPath, classicFile, codeModel.project, subfolder, layer);
         importApis(classicFile, client, codeModel, operationGroup, layer);
+        // We need to import the paging helpers and types explicitly because ts-morph may not be able to find them.
+        importPagingDependencies(
+          srcPath,
+          classicFile,
+          codeModel.project,
+          subfolder,
+          operationGroup.namespaceHierarchies.length
+        );
         classicFile.fixMissingImports();
         classicFile.fixUnusedIdentifiers();
         classicOperationFiles.set(classicOperationFileName, classicFile);

package/src/modular/buildCodeModel.ts

@@ -20,7 +20,6 @@ import {
   getEffectiveModelType,
   getDiscriminator,
   Operation,
-  isKey,
   Scalar,
   IntrinsicScalarName,
   isStringType,
@@ -69,7 +68,6 @@ import {
   getClientType,
   SdkEnumValueType
 } from "@azure-tools/typespec-client-generator-core";
-import { getResourceOperation } from "@typespec/rest";
 import {
   ModularCodeModel,
   Client as HrlcClient,
@@ -78,9 +76,11 @@ import {
   OperationGroup,
   Response,
   Type as HrlcType,
-  Header
+  Header,
+  Property
 } from "./modularCodeModel.js";
 import {
+  getBodyType,
   getEnrichedDefaultApiVersion,
   isAzureCoreErrorType
 } from "../utils/modelUtils.js";
@@ -96,7 +96,9 @@ import {
   getOperationName,
   isBinaryPayload,
   isIgnoredHeaderParam,
-  isLongRunningOperation
+  isLongRunningOperation,
+  parseItemName,
+  parseNextLinkName
 } from "../utils/operationUtil.js";
 import { SdkContext } from "../utils/interfaces.js";
 import { Project } from "ts-morph";
@@ -105,6 +107,8 @@ import {
   getModelNamespaceName,
   getOperationNamespaceInterfaceName
 } from "../utils/namespaceUtils.js";
+import { reportDiagnostic } from "../lib.js";
+import { getType as getTypeName } from "./helpers/typeHelpers.js";
 
 interface HttpServerParameter {
   type: "endpointPath";
@@ -194,8 +198,10 @@ function handleDiscriminator(context: SdkContext, type: Model) {
   const discriminator = getDiscriminator(context.program, type);
   if (discriminator) {
     const discriminatorValues: string[] = [];
+    const aliases: string[] = [];
     for (const childModel of type.derivedModels) {
       const modelType = getType(context, childModel);
+      aliases.push(modelType.name);
       for (const property of modelType.properties) {
         if (property.restApiName === discriminator.propertyName) {
           modelType.discriminatorValue = property.type.value;
@@ -203,17 +209,22 @@ function handleDiscriminator(context: SdkContext, type: Model) {
         }
       }
     }
-    // it is not included in properties of typespec but needed by python codegen
-    if (discriminatorValues.length > 0) {
-      const discriminatorInfo = {
-        description: `the discriminator possible values ${discriminatorValues.join(
-          ", "
-        )}`,
-        isPolymorphic: true,
-        isDiscriminator: true
-      };
-      return discriminatorInfo;
-    }
+    const discriminatorInfo = {
+      description:
+        discriminatorValues.length > 0
+          ? `the discriminator possible values: ${discriminatorValues.join(
+              ", "
+            )}`
+          : "discriminator property",
+      type: { type: "string" },
+      restApiName: discriminator.propertyName,
+      clientName: discriminator.propertyName,
+      name: discriminator.propertyName,
+      isPolymorphic: true,
+      isDiscriminator: true,
+      aliases
+    };
+    return discriminatorInfo;
   }
   return undefined;
 }
@@ -260,6 +271,8 @@ function processModelProperties(
   model: Model
 ) {
   // need to do properties after insertion to avoid infinite recursion
+  const discriminatorInfo = handleDiscriminator(context, model);
+  let hasDiscriminator = false;
   for (const property of model.properties.values()) {
     if (!isSchemaProperty(context.program, property)) {
       continue;
@@ -269,12 +282,24 @@ function processModelProperties(
     }
     let newProperty = emitProperty(context, property);
     if (isDiscriminator(context, model, property.name)) {
-      newProperty = { ...newProperty, ...handleDiscriminator(context, model) };
+      hasDiscriminator = true;
+      newProperty = {
+        ...newProperty,
+        ...discriminatorInfo,
+        type: newProperty["type"]
+      };
     }
     newValue.properties.push(newProperty);
   }
-  // need to do discriminator outside `emitModel` to avoid infinite recursion
-  // handleDiscriminator(context, model, newValue);
+  if (discriminatorInfo) {
+    if (!hasDiscriminator) {
+      newValue.properties.push({ ...discriminatorInfo });
+    }
+    newValue.alias = `${newValue.name}Parent`;
+    newValue.isPolyBaseModel = true;
+    discriminatorInfo?.aliases.push(`${newValue.alias}`);
+    newValue.aliasType = discriminatorInfo?.aliases.join(" | ");
+  }
 }
 
 function isEmptyAnonymousModel(type: EmitterType): boolean {
@@ -396,49 +421,10 @@ type BodyParameter = ParamBase & {
   type: Type;
   restApiName: string;
   location: "body";
-  defaultContentType: string;
+  // defaultContentType: string;
   isBinaryPayload: boolean;
 };
 
-function getBodyType(program: Program, route: HttpOperation): Type {
-  let bodyModel = route.parameters.body?.type;
-  if (bodyModel && bodyModel.kind === "Model" && route.operation) {
-    const resourceType = getResourceOperation(
-      program,
-      route.operation
-    )?.resourceType;
-    if (resourceType && route.responses && route.responses.length > 0) {
-      const resp = route.responses[0];
-      if (resp && resp.responses && resp.responses.length > 0) {
-        const responseBody = resp.responses[0]?.body;
-        if (responseBody?.type?.kind === "Model") {
-          const bodyTypeInResponse = getEffectiveSchemaType(
-            program,
-            responseBody.type
-          );
-          // response body type is reosurce type, and request body type (if templated) contains resource type
-          if (
-            bodyTypeInResponse === resourceType &&
-            bodyModel.templateMapper &&
-            bodyModel.templateMapper.args &&
-            bodyModel.templateMapper.args.some((it) => {
-              return it.kind === "Model" || it.kind === "Union"
-                ? it === bodyTypeInResponse
-                : false;
-            })
-          ) {
-            bodyModel = resourceType;
-          }
-        }
-      }
-    }
-    if (resourceType && bodyModel.name === "") {
-      bodyModel = resourceType;
-    }
-  }
-  return bodyModel!;
-}
-
 function emitBodyParameter(
   context: SdkContext,
   httpOperation: HttpOperation
@@ -450,25 +436,17 @@ function emitBodyParameter(
   if (contentTypes.length === 0) {
     contentTypes = ["application/json"];
   }
-  if (contentTypes.length !== 1) {
-    throw Error("Currently only one kind of content-type!");
-  }
-  const type = getType(context, getBodyType(context.program, httpOperation), {
+  const type = getType(context, getBodyType(context.program, httpOperation)!, {
     disableEffectiveModel: true
   });
 
-  const defaultContentType =
-    body.parameter?.default ?? contentTypes.includes("application/json")
-      ? "application/json"
-      : contentTypes[0]!;
   return {
     contentTypes,
     type,
     restApiName: body.parameter?.name ?? "body",
     location: "body",
     ...base,
-    defaultContentType,
-    isBinaryPayload: isBinaryPayload(context, body.type, defaultContentType)
+    isBinaryPayload: isBinaryPayload(context, body.type, contentTypes)
   };
 }
 
@@ -639,11 +617,39 @@ function emitOperation(
   operationGroupName: string,
   rlcModels: RLCModel
 ): HrlcOperation {
+  const isBranded = rlcModels.options?.branded ?? true;
+  // Skip to extract paging and lro information for non-branded clients.
+  if (!isBranded) {
+    return emitBasicOperation(
+      context,
+      operation,
+      operationGroupName,
+      rlcModels
+    );
+  }
   const lro = isLongRunningOperation(
     context.program,
     ignoreDiagnostics(getHttpOperation(context.program, operation))
   );
-  const paging = getPagedResult(context.program, operation);
+  const pagingMetadata = getPagedResult(context.program, operation);
+  // Disable the paging feature if no itemsSegments is found.
+  const paging =
+    pagingMetadata &&
+    pagingMetadata.itemsSegments &&
+    pagingMetadata.itemsSegments.length > 0;
+  if (
+    pagingMetadata &&
+    (!pagingMetadata.itemsSegments || pagingMetadata.itemsSegments.length === 0)
+  ) {
+    reportDiagnostic(context.program, {
+      code: "no-paging-items-defined",
+      format: {
+        operationName: operation.name
+      },
+      target: operation
+    });
+  }
+
   if (lro && paging) {
     return emitLroPagingOperation(
       context,
@@ -680,8 +686,8 @@ function addPagingInformation(
       "Trying to add paging information, but not paging metadata for this operation"
     );
   }
-  emittedOperation["itemName"] = pagedResult.itemsPath;
-  emittedOperation["continuationTokenName"] = pagedResult.nextLinkPath;
+  emittedOperation["itemName"] = parseItemName(pagedResult);
+  emittedOperation["continuationTokenName"] = parseNextLinkName(pagedResult);
 }
 
 function emitLroPagingOperation(
@@ -939,8 +945,7 @@ function emitProperty(
     optional: property.optional,
     description: getDocStr(context.program, property),
     addedOn: getAddedOnVersion(context.program, property),
-    readonly:
-      isReadOnly(context.program, property) || isKey(context.program, property),
+    readonly: isReadOnly(context.program, property),
     clientDefaultValue: clientDefaultValue,
     format: newProperty.format
   };
@@ -992,8 +997,8 @@ function emitModel(context: SdkContext, type: Model): Record<string, any> {
     (context.rlcOptions?.enableModelNamespace
       ? fullNamespaceName
       : effectiveName
-      ? effectiveName
-      : getName(context.program, type));
+        ? effectiveName
+        : getName(context.program, type));
   if (
     !overridedModelName &&
     type.templateMapper &&
@@ -1312,14 +1317,32 @@ function emitUnion(context: SdkContext, type: Union): Record<string, any> {
   }
   if (sdkType.kind === "union") {
     const unionName = type.name;
+    const discriminatorPropertyName = getDiscriminator(context.program, type)
+      ?.propertyName;
+    const variantTypes = sdkType.values.map((x) => {
+      const valueType = getType(context, x.__raw!);
+      if (valueType.properties && discriminatorPropertyName) {
+        valueType.discriminatorValue = valueType.properties.filter(
+          (p: Property) => p.clientName === discriminatorPropertyName
+        )[0].type.value;
+      }
+      return valueType;
+    });
     return {
       nullable: sdkType.nullable,
       name: unionName,
       description: `Type of ${unionName}`,
       internal: true,
       type: "combined",
-      types: sdkType.values.map((x) => getType(context, x.__raw!)),
-      xmlMetadata: {}
+      types: variantTypes,
+      xmlMetadata: {},
+      discriminator: discriminatorPropertyName,
+      alias:
+        unionName === "" || unionName === undefined ? undefined : unionName,
+      aliasType:
+        unionName === "" || unionName === undefined
+          ? undefined
+          : variantTypes.map((x) => getTypeName(x).name).join(" | ")
     };
   } else if (sdkType.kind === "enum") {
     return {

package/src/modular/buildOperations.ts

@@ -12,6 +12,8 @@ import { isRLCMultiEndpoint } from "../utils/clientUtils.js";
 import { getDocsFromDescription } from "./helpers/docsHelpers.js";
 import { SdkContext } from "../utils/interfaces.js";
 import { getImportSpecifier } from "@azure-tools/rlc-common";
+import { addImportsToFiles } from "@azure-tools/rlc-common";
+import { clearImportSets } from "@azure-tools/rlc-common";
 
 /**
  * This function creates a file under /api for each operation group.
@@ -26,7 +28,7 @@ export function buildOperationFiles(
 ) {
   const operationFiles = [];
   for (const operationGroup of client.operationGroups) {
-    const importSet: Map<string, Set<string>> = new Map<string, Set<string>>();
+    clearImportSets(codeModel.runtimeImports);
     const operationFileName =
       operationGroup.className && operationGroup.namespaceHierarchies.length > 0
         ? `${operationGroup.namespaceHierarchies
@@ -56,6 +58,15 @@ export function buildOperationFiles(
       operationGroup.namespaceHierarchies.length
     );
 
+    // We need to import the paging helpers and types explicitly because ts-morph may not be able to find them.
+    importPagingDependencies(
+      srcPath,
+      operationGroupFile,
+      codeModel.project,
+      subfolder,
+      operationGroup.namespaceHierarchies.length
+    );
+
     const namedImports: string[] = [];
     let clientType = "Client";
     if (isRLCMultiEndpoint(dpgContext)) {
@@ -95,14 +106,12 @@ export function buildOperationFiles(
         dpgContext,
         o,
         clientType,
-        importSet,
         codeModel.runtimeImports
       );
       const deserializeOperationDeclaration = getDeserializePrivateFunction(
         o,
         isRLCMultiEndpoint(dpgContext),
         needUnexpectedHelper,
-        importSet,
         codeModel.runtimeImports
       );
       operationGroupFile.addFunctions([
@@ -124,16 +133,7 @@ export function buildOperationFiles(
         ]
       }
     ]);
-    if (importSet.size > 0) {
-      for (const [moduleName, imports] of importSet.entries()) {
-        operationGroupFile.addImportDeclarations([
-          {
-            moduleSpecifier: moduleName,
-            namedImports: [...imports.values()]
-          }
-        ]);
-      }
-    }
+    addImportsToFiles(codeModel.runtimeImports, operationGroupFile);
     operationGroupFile.fixMissingImports();
     // have to fixUnusedIdentifiers after everything get generated.
     operationGroupFile.fixUnusedIdentifiers();
@@ -175,6 +175,48 @@ export function importModels(
   // sourceFile.fixUnusedIdentifiers();
 }
 
+export function importPagingDependencies(
+  srcPath: string,
+  sourceFile: SourceFile,
+  project: Project,
+  subfolder: string = "",
+  importLayer: number = 0
+) {
+  const pagingTypes = project.getSourceFile(
+    `${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}models/pagingTypes.ts`
+  );
+
+  if (!pagingTypes) {
+    return;
+  }
+
+  const exportedPaingTypes = [...pagingTypes.getExportedDeclarations().keys()];
+
+  sourceFile.addImportDeclaration({
+    moduleSpecifier: `${"../".repeat(importLayer + 1)}models/pagingTypes.js`,
+    namedImports: exportedPaingTypes
+  });
+
+  const pagingHelper = project.getSourceFile(
+    `${srcPath}/${subfolder !== "" ? subfolder + "/" : ""}api/pagingHelpers.ts`
+  );
+
+  if (!pagingHelper) {
+    return;
+  }
+
+  const exportedPaingHelpers = [
+    ...pagingHelper.getExportedDeclarations().keys()
+  ];
+
+  sourceFile.addImportDeclaration({
+    moduleSpecifier: `${
+      importLayer === 0 ? "./" : "../".repeat(importLayer)
+    }pagingHelpers.js`,
+    namedImports: exportedPaingHelpers
+  });
+}
+
 /**
  * This function generates the interfaces for each operation options
  */