@azure-tools/typespec-ts 0.18.0 → 0.19.0

package/src/utils/emitUtil.ts

@@ -8,13 +8,14 @@ import { prettierJSONOptions, prettierTypeScriptOptions } from "../lib.js";
 
 export async function emitModels(rlcModels: RLCModel, program: Program) {
   const schemaOutput = buildSchemaTypes(rlcModels);
+  const isBranded = rlcModels?.options?.branded ?? true;
   if (schemaOutput) {
     const { inputModelFile, outputModelFile } = schemaOutput;
     if (inputModelFile) {
-      await emitFile(inputModelFile, program);
+      await emitFile(inputModelFile, program, isBranded);
     }
     if (outputModelFile) {
-      await emitFile(outputModelFile, program);
+      await emitFile(outputModelFile, program, isBranded);
     }
   }
 }
@@ -28,6 +29,7 @@ export async function emitContentByBuilder(
   if (!Array.isArray(builderFnOrList)) {
     builderFnOrList = [builderFnOrList];
   }
+  const isBranded = rlcModels?.options?.branded ?? true;
   for (const builderFn of builderFnOrList) {
     let contentFiles: File[] | File | undefined = builderFn(rlcModels);
     if (!contentFiles) {
@@ -37,7 +39,7 @@ export async function emitContentByBuilder(
       contentFiles = [contentFiles];
     }
     for (const file of contentFiles) {
-      await emitFile(file, program, emitterOutputDir);
+      await emitFile(file, program, isBranded, emitterOutputDir);
     }
   }
 }
@@ -45,13 +47,17 @@ export async function emitContentByBuilder(
 async function emitFile(
   file: File,
   program: Program,
+  isBranded: boolean,
   emitterOutputDir?: string
 ) {
   const host: CompilerHost = program.host;
   const filePath = join(emitterOutputDir ?? "", file.path);
   const isJson = /\.json$/gi.test(filePath);
   const isSourceCode = /\.(ts|js)$/gi.test(filePath);
-  const licenseHeader = `// Copyright (c) Microsoft Corporation.\n// Licensed under the MIT license.\n`;
+  const microsoftHeader = isBranded
+    ? `// Copyright (c) Microsoft Corporation.\n`
+    : "";
+  const licenseHeader = `${microsoftHeader}// Licensed under the MIT license.\n`;
   let prettierFileContent = file.content;
 
   if (isSourceCode) {

package/src/utils/modelUtils.ts

@@ -70,6 +70,7 @@ import {
   isApiVersion
 } from "@azure-tools/typespec-client-generator-core";
 import { SdkContext } from "./interfaces.js";
+import { getModelNamespaceName } from "./namespaceUtils.js";
 
 export function getBinaryType(usage: SchemaContext[]) {
   return usage.includes(SchemaContext.Output)
@@ -503,7 +504,16 @@ function getSchemaForModel(
   const program = dpgContext.program;
   const overridedModelName =
     getFriendlyName(program, model) ?? getProjectedName(program, model, "json");
-  let name = model.name;
+  const fullNamespaceName =
+    overridedModelName ??
+    getModelNamespaceName(dpgContext, model.namespace!)
+      .map((nsName) => {
+        return normalizeName(nsName, NameType.Interface);
+      })
+      .join("") + model.name;
+  let name = dpgContext.rlcOptions?.enableModelNamespace
+    ? fullNamespaceName
+    : model.name;
   if (
     !overridedModelName &&
     model.templateMapper &&

package/src/utils/namespaceUtils.ts

@@ -0,0 +1,74 @@
+import { getAllModels } from "@azure-tools/typespec-client-generator-core";
+import {
+  Namespace,
+  isGlobalNamespace,
+  isService,
+  Operation
+} from "@typespec/compiler";
+import { SdkContext } from "../utils/interfaces.js";
+
+export function getModelNamespaceName(
+  dpgContext: SdkContext,
+  namespace: Namespace
+): string[] {
+  const result: string[] = [];
+  namespace &&
+  !isGlobalNamespace(dpgContext.program, namespace) &&
+  !isService(dpgContext.program, namespace)
+    ? (result.push(...getModelNamespaceName(dpgContext, namespace.namespace!)),
+      result.push(namespace.name))
+    : result;
+  return result;
+}
+
+export function getOperationNamespaceInterfaceName(
+  dpgContext: SdkContext,
+  operation: Operation
+): string[] {
+  const result: string[] = [];
+  if (
+    dpgContext.rlcOptions?.hierarchyClient === false &&
+    dpgContext.rlcOptions?.enableOperationGroup !== true
+  ) {
+    return result;
+  }
+  if (operation.interface) {
+    if (
+      dpgContext.rlcOptions?.enableOperationGroup === true &&
+      dpgContext.rlcOptions?.hierarchyClient === false
+    ) {
+      result.push(operation.interface.name);
+      return result;
+    }
+    if (operation.interface.namespace) {
+      result.push(
+        ...getModelNamespaceName(dpgContext, operation.interface.namespace)
+      );
+    }
+    result.push(operation.interface.name);
+  } else if (operation.namespace) {
+    !isGlobalNamespace(dpgContext.program, operation.namespace) &&
+    !isService(dpgContext.program, operation.namespace)
+      ? (result.push(
+          ...getModelNamespaceName(dpgContext, operation.namespace.namespace!)
+        ),
+        result.push(operation.namespace.name))
+      : result;
+  }
+  return result;
+}
+
+export function detectModelConflicts(dpgContext: SdkContext) {
+  const allModels = getAllModels(dpgContext);
+  const nameSet = new Set<string>();
+  for (const model of allModels) {
+    if (model.name === "") {
+      continue;
+    }
+    if (nameSet.has(model.name)) {
+      return true;
+    }
+    nameSet.add(model.name);
+  }
+  return false;
+}

package/src/utils/operationUtil.ts

@@ -13,8 +13,6 @@ import {
 import {
   getProjectedName,
   ignoreDiagnostics,
-  isGlobalNamespace,
-  isService,
   Model,
   Operation,
   Program,
@@ -44,6 +42,7 @@ import {
 } from "@azure-tools/rlc-common";
 import { isByteOrByteUnion } from "./modelUtils.js";
 import { SdkContext } from "./interfaces.js";
+import { getOperationNamespaceInterfaceName } from "./namespaceUtils.js";
 
 // Sorts the responses by status code
 export function sortedOperationResponses(responses: HttpOperationResponse[]) {
@@ -142,29 +141,21 @@ export function getOperationGroupName(
   if (!dpgContext.rlcOptions?.enableOperationGroup || !operationOrRoute) {
     return "";
   }
-  const program = dpgContext.program;
   // If this is a HttpOperation
   if ((operationOrRoute as any).kind !== "Operation") {
     operationOrRoute = (operationOrRoute as HttpOperation).operation;
   }
   const operation = operationOrRoute as Operation;
-  if (operation.interface) {
-    return normalizeName(
-      operation.interface?.name ?? "",
-      NameType.Interface,
-      true
-    );
-  }
-  const namespace = operation.namespace;
-  if (
-    namespace === undefined ||
-    isGlobalNamespace(program, namespace) ||
-    isService(program, namespace)
-  ) {
-    return "";
-  }
+  const namespaceNames = getOperationNamespaceInterfaceName(
+    dpgContext,
+    operation
+  );
 
-  return normalizeName(namespace.name ?? "", NameType.Interface, true);
+  return namespaceNames
+    .map((name) => {
+      return normalizeName(name, NameType.Interface, true);
+    })
+    .join("");
 }
 
 export function getOperationName(program: Program, operation: Operation) {

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

@@ -1,7 +0,0 @@
-import { SourceFile } from "ts-morph";
-import { Type } from "../modularCodeModel.js";
-/**
- * This function adds an import to the soruce file to import the right credential
- */
-export declare function importCredential(credential: Type, clientSourceFile: SourceFile): void;
-//# sourceMappingURL=credentialHelpers.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"credentialHelpers.d.ts","sourceRoot":"","sources":["../../../../src/modular/helpers/credentialHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAE9C;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,IAAI,EAChB,gBAAgB,EAAE,UAAU,GAC3B,IAAI,CA8BN"}

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

@@ -1,32 +0,0 @@
-/**
- * This function adds an import to the soruce file to import the right credential
- */
-export function importCredential(credential, clientSourceFile) {
-    switch (credential.type) {
-        case "Key":
-            clientSourceFile.addImportDeclaration({
-                moduleSpecifier: "@azure/core-auth",
-                namedImports: ["KeyCredential"]
-            });
-            return;
-        case "OAuth2":
-            clientSourceFile.addImportDeclaration({
-                moduleSpecifier: "@azure/core-auth",
-                namedImports: ["TokenCredential"]
-            });
-            return;
-        case "combined":
-            if (!credential.types) {
-                break;
-            }
-            for (const cred of credential.types) {
-                if (cred.type === "Key" || cred.type === "OAuth2") {
-                    importCredential(cred, clientSourceFile);
-                }
-            }
-            break;
-        default:
-            throw new Error(`Credential of type ${credential.type} is not yet supported`);
-    }
-}
-//# sourceMappingURL=credentialHelpers.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"credentialHelpers.js","sourceRoot":"","sources":["../../../../src/modular/helpers/credentialHelpers.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAC9B,UAAgB,EAChB,gBAA4B;IAE5B,QAAQ,UAAU,CAAC,IAAI,EAAE;QACvB,KAAK,KAAK;YACR,gBAAgB,CAAC,oBAAoB,CAAC;gBACpC,eAAe,EAAE,kBAAkB;gBACnC,YAAY,EAAE,CAAC,eAAe,CAAC;aAChC,CAAC,CAAC;YACH,OAAO;QACT,KAAK,QAAQ;YACX,gBAAgB,CAAC,oBAAoB,CAAC;gBACpC,eAAe,EAAE,kBAAkB;gBACnC,YAAY,EAAE,CAAC,iBAAiB,CAAC;aAClC,CAAC,CAAC;YACH,OAAO;QACT,KAAK,UAAU;YACb,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;gBACrB,MAAM;aACP;YAED,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,KAAK,EAAE;gBACnC,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;oBACjD,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;iBAC1C;aACF;YACD,MAAM;QACR;YACE,MAAM,IAAI,KAAK,CACb,sBAAsB,UAAU,CAAC,IAAI,uBAAuB,CAC7D,CAAC;KACL;AACH,CAAC"}

package/src/modular/helpers/credentialHelpers.ts

@@ -1,40 +0,0 @@
-import { SourceFile } from "ts-morph";
-import { Type } from "../modularCodeModel.js";
-
-/**
- * This function adds an import to the soruce file to import the right credential
- */
-export function importCredential(
-  credential: Type,
-  clientSourceFile: SourceFile
-): void {
-  switch (credential.type) {
-    case "Key":
-      clientSourceFile.addImportDeclaration({
-        moduleSpecifier: "@azure/core-auth",
-        namedImports: ["KeyCredential"]
-      });
-      return;
-    case "OAuth2":
-      clientSourceFile.addImportDeclaration({
-        moduleSpecifier: "@azure/core-auth",
-        namedImports: ["TokenCredential"]
-      });
-      return;
-    case "combined":
-      if (!credential.types) {
-        break;
-      }
-
-      for (const cred of credential.types) {
-        if (cred.type === "Key" || cred.type === "OAuth2") {
-          importCredential(cred, clientSourceFile);
-        }
-      }
-      break;
-    default:
-      throw new Error(
-        `Credential of type ${credential.type} is not yet supported`
-      );
-  }
-}