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

package/src/modular/emitModels.ts

@@ -1,7 +1,9 @@
 import { Project, SourceFile } from "ts-morph";
 import { getType } from "./helpers/typeHelpers.js";
-import { ModularCodeModel, Type } from "./modularCodeModel.js";
+import { Client, ModularCodeModel, Type } from "./modularCodeModel.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
@@ -11,17 +13,21 @@ export function buildModels(
   project: Project,
   srcPath: string = "src",
   subfolder: string = ""
-): SourceFile {
-  const modelsFile = project.createSourceFile(
-    path.join(`${srcPath}/src/`, subfolder, `models/models.ts`)
-  );
-
+): SourceFile | undefined {
   // We are generating both models and enums here
   const coreClientTypes = new Set<string>();
   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 model.types ?? []) {
@@ -48,7 +54,7 @@ export function buildModels(
         name: model.name!,
         isExported: true,
         docs: [
-          model.description ?? "",
+          ...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
@@ -68,7 +74,7 @@ export function buildModels(
       modelsFile.addInterface({
         name: model.name,
         isExported: true,
-        docs: [model.description ?? ""],
+        docs: getDocsFromDescription(model.description),
         properties: properties.map((p) => {
           const propertyMetadata = getType(p.type);
           let propertyTypeName = propertyMetadata.name;
@@ -82,7 +88,7 @@ export function buildModels(
           }
           return {
             name: `"${p.clientName}"`,
-            docs: [p.description],
+            docs: getDocsFromDescription(p.description),
             hasQuestionToken: p.optional,
             isReadonly: p.readonly,
             type: propertyTypeName
@@ -117,3 +123,43 @@ function isAzureCoreError(t: Type) {
     t.isCoreErrorType === true
   );
 }
+
+export function buildModelsOptions(
+  client: Client,
+  project: Project,
+  srcPath: string = "src",
+  subfolder: string = ""
+) {
+  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;
+    });
+}

package/src/modular/helpers/clientHelpers.ts

@@ -1,11 +1,13 @@
 import { OptionalKind, ParameterDeclarationStructure } from "ts-morph";
 import { Client } from "../modularCodeModel.js";
-import { getParameterType } from "./parameterHelpers.js";
+import { getType } from "./typeHelpers.js";
+import { getClientName } from "./namingHelpers.js";
 
 export function getClientParameters(
   client: Client
 ): OptionalKind<ParameterDeclarationStructure>[] {
-  const { name, parameters } = client;
+  const { parameters } = client;
+  const name = getClientName(client);
   const optionsParam = {
     name: "options",
     type: `${name}ClientOptions`,
@@ -22,7 +24,7 @@ export function getClientParameters(
       .map<OptionalKind<ParameterDeclarationStructure>>((p) => {
         return {
           name: p.clientName,
-          type: getParameterType(p)
+          type: getType(p.type).name
         };
       }),
     optionsParam

package/src/modular/helpers/docsHelpers.ts

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