@azure-tools/typespec-ts 0.56.1-dev.1 → 0.57.0-dev.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.56.1-dev.1",
+  "version": "0.57.0-dev.10",
   "description": "A TypeSpec emitter for TypeScript",
   "main": "dist/src/index.js",
   "type": "module",
@@ -17,55 +17,55 @@
   "author": "Jose Heredia <joheredi@microsoft.com>",
   "license": "MIT",
   "devDependencies": {
-    "@azure-rest/core-client": "^2.7.0",
-    "@azure-tools/azure-http-specs": "^0.1.0-alpha.44 || >= 0.1.0-alpha.45-dev.3",
-    "@azure-tools/typespec-autorest": "^0.71.0 || >= 0.72.0-dev.0",
-    "@azure-tools/typespec-azure-core": "^0.71.0 || >= 0.72.0-dev.0",
-    "@azure-tools/typespec-azure-resource-manager": "^0.71.0 || >= 0.72.0-dev.1",
-    "@azure-tools/typespec-client-generator-core": "^0.71.2 || >= 0.72.0-dev.3",
-    "@azure/abort-controller": "^2.1.2",
-    "@azure/core-auth": "^1.6.0",
-    "@azure/core-lro": "^3.1.0",
-    "@azure/core-paging": "^1.5.0",
-    "@azure/core-rest-pipeline": "^1.24.0",
-    "@azure/core-util": "^1.4.0",
-    "@azure/logger": "^1.0.4",
-    "@typespec/ts-http-runtime": "0.3.7",
+    "@azure-rest/core-client": "^2.8.0",
+    "@azure-tools/azure-http-specs": "^0.1.0-alpha.44 || >= 0.1.0-alpha.45-dev.4",
+    "@azure-tools/typespec-autorest": "^0.71.0 || >= 0.72.0-dev.3",
+    "@azure-tools/typespec-azure-core": "^0.71.0 || >= 0.72.0-dev.2",
+    "@azure-tools/typespec-azure-resource-manager": "^0.71.0 || >= 0.72.0-dev.9",
+    "@azure-tools/typespec-client-generator-core": "^0.71.2 || >= 0.72.0-dev.7",
+    "@azure/abort-controller": "^2.2.0",
+    "@azure/core-auth": "^1.11.0",
+    "@azure/core-lro": "^3.4.0",
+    "@azure/core-paging": "^1.7.0",
+    "@azure/core-rest-pipeline": "^1.25.0",
+    "@azure/core-util": "^1.14.0",
+    "@azure/logger": "^1.4.0",
+    "@typespec/ts-http-runtime": "0.3.8",
     "cross-env": "^10.1.0",
-    "concurrently": "^10.0.4",
-    "vitest": "^4.1.3",
-    "vite": "^8.1.2",
-    "@vitest/coverage-v8": "^4.1.3",
-    "@microsoft/api-extractor": "^7.58.1",
+    "concurrently": "^10.0.5",
+    "vitest": "^4.1.11",
+    "vite": "^8.2.2",
+    "@vitest/coverage-v8": "^4.1.11",
+    "@microsoft/api-extractor": "~7.58.1",
     "@types/pluralize": "^0.0.33",
-    "yaml": "^2.8.3",
+    "yaml": "^2.9.0",
     "@azure-tools/spector-runner": "^0.1.0",
-    "@typespec/spector": "^0.1.0-alpha.28",
-    "@typespec/spec-api": "^0.1.0-alpha.16",
     "@typespec/http-specs": "^0.1.0-alpha.41",
-    "@typespec/tspd": "^0.77.0",
+    "@typespec/spec-api": "^0.1.0-alpha.16",
+    "@typespec/spector": "^0.1.0-alpha.28",
     "@typespec/compiler": "^1.15.0",
+    "@typespec/tspd": "^0.77.0",
     "@typespec/http": "^1.15.0",
-    "@typespec/versioning": "^0.85.0",
+    "@typespec/rest": "^0.85.0",
     "@typespec/openapi": "^1.15.0",
-    "@typespec/xml": "^0.85.0",
-    "@typespec/rest": "^0.85.0"
+    "@typespec/versioning": "^0.85.0",
+    "@typespec/xml": "^0.85.0"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": "^0.71.0 || >= 0.72.0-dev.0",
-    "@azure-tools/typespec-client-generator-core": "^0.71.2 || >= 0.72.0-dev.3",
+    "@azure-tools/typespec-azure-core": "^0.71.0 || >= 0.72.0-dev.2",
+    "@azure-tools/typespec-client-generator-core": "^0.71.2 || >= 0.72.0-dev.7",
     "@typespec/compiler": "^1.15.0",
-    "@typespec/http": "^1.15.0",
     "@typespec/rest": "^0.85.0",
     "@typespec/xml": "^0.85.0",
-    "@typespec/versioning": "^0.85.0"
+    "@typespec/versioning": "^0.85.0",
+    "@typespec/http": "^1.15.0"
   },
   "dependencies": {
-    "fast-xml-parser": "^5.10.1",
+    "fast-xml-parser": "^5.11.0",
     "pluralize": "^8.0.0",
-    "prettier": "^3.9.5",
-    "ts-morph": "^23.0.0",
-    "tslib": "^2.3.1"
+    "prettier": "^3.9.6",
+    "ts-morph": "^28.0.0",
+    "tslib": "^2.8.1"
   },
   "files": [
     "src",

package/src/framework/hooks/sdk-types.ts

@@ -13,6 +13,7 @@ import { provideContext, useContext } from "../../context-manager.js";
 import { reportDiagnostic } from "../../lib.js";
 import { visitPackageTypes } from "../../modular/emit-models.js";
 import { getAllAncestors, getAllProperties } from "../../modular/helpers/operation-helpers.js";
+import { applyVisibilityModelSplit } from "../../modular/helpers/visibility-helpers.js";
 import { normalizeModelPropertyName } from "../../modular/type-expressions/get-type-expression.js";
 import type { SdkContext } from "../../utils/interfaces.js";
 import { NameType, normalizeName } from "../../utils/name-utils.js";
@@ -92,6 +93,7 @@ export function provideSdkTypes(context: SdkContext) {
     types: new Map<Type, SdkType>(),
     flattenProperties: new Map<SdkModelPropertyType, SdkFlattenPropertyContext>(),
   };
+  applyVisibilityModelSplit(context);
   visitPackageTypes(context);
   enrichFlattenProperties(context, sdkTypesContext.flattenProperties, flattenPropertyModelMap);
   for (const sdkModel of emitQueue) {

package/src/interfaces.ts

@@ -260,6 +260,10 @@ export interface ClientOptions {
    * Defaults to false.
    */
   generateReactNativeTarget?: boolean;
+  /**
+   * Generates visibility-specific request models. Experimental and disabled by default.
+   */
+  experimentalSplitModelsByVisibility?: boolean;
 }
 
 export interface ServiceInfo {

package/src/lib.ts

@@ -91,6 +91,7 @@ export interface EmitterOptions {
    * package.json exports). Defaults to `false`.
    */
   "generate-react-native-target"?: boolean;
+  "experimental-split-models-by-visibility"?: boolean;
 }
 
 export const EmitterOptionsSchema: JSONSchemaType<EmitterOptions> = {
@@ -312,6 +313,12 @@ export const EmitterOptionsSchema: JSONSchemaType<EmitterOptions> = {
       description:
         "When set to true, generates React Native build targets (tsconfig, warp target, package.json exports). Defaults to `false`.",
     },
+    "experimental-split-models-by-visibility": {
+      type: "boolean",
+      nullable: true,
+      description:
+        "Whether to project request-body models to their write visibility (e.g. WidgetCreate/WidgetCreateOrUpdate) so read-only properties do not leak into input types. Defaults to false",
+    },
   },
   required: [],
 };
@@ -476,6 +483,12 @@ const libDef = {
         default: paramMessage`Property name ${"propertyName"} is normalized to ${"normalizedName"}.`,
       },
     },
+    "invalid-exact-name": {
+      severity: "warning",
+      messages: {
+        default: paramMessage`Exact ${"nameKind"} name ${"name"} is not a valid TypeScript identifier. Choose a valid TypeScript identifier or remove exact().`,
+      },
+    },
     "un-supported-format-cases": {
       severity: "warning",
       messages: {

package/src/metadata/build-package-file.ts

@@ -61,6 +61,7 @@ export function buildPackageFile(
  * - Adds LRO dependencies (`@azure/core-lro`, `@azure/abort-controller`) when the package has
  *   polling operations (for non-monorepo Azure packages).
  * - Updates exports (tshy or warp) when `exports` is provided.
+ * - Adds the default `customize` script when the package does not define one.
  */
 export function updatePackageFile(
   model: ClientModel,
@@ -86,6 +87,9 @@ export function updatePackageFile(
     packageInfo = existingFilePathOrContent;
   }
 
+  packageInfo.scripts ??= {};
+  packageInfo.scripts.customize ??= "echo skipped";
+
   // Migrate AutoRest-specific dependency names and versions to their TypeSpec equivalents.
   const deps: Record<string, string> = { ...(packageInfo.dependencies ?? {}) };
   let needsCoreClientUpdate = false;

package/src/metadata/package-json/build-azure-monorepo-package.ts

@@ -136,6 +136,7 @@ function getAzureMonorepoScripts(config: AzureMonorepoInfoConfig) {
       config.withSamples ? '"samples-dev/*.ts"' : ""
     }`,
     clean: "rimraf --glob dist dist-browser dist-esm test-dist temp types *.tgz *.log",
+    customize: "echo skipped",
     "execute:samples": config.withSamples ? "dev-tool samples run samples-dev" : "echo skipped",
     "extract-api": "rimraf review && dev-tool run extract-api",
     format: `prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore "src/**/*.{ts,cts,mts}" "test/**/*.{ts,cts,mts}" "*.{js,cjs,mjs,json}" ${

package/src/modular/build-classical-client.ts

@@ -19,9 +19,9 @@ import { useContext } from "../context-manager.js";
 import { useDependencies } from "../framework/hooks/use-dependencies.js";
 import { resolveReference } from "../framework/reference.js";
 import { refkey } from "../framework/refkey.js";
-import { getClientModuleInfo, isMultiEndpointClient } from "../utils/client-utils.js";
+import { getClientModuleInfo } from "../utils/client-utils.js";
 import type { SdkContext } from "../utils/interfaces.js";
-import { NameType, normalizeName } from "../utils/name-utils.js";
+import { NameType, normalizeName, normalizeSdkName } from "../utils/name-utils.js";
 import { getMethodHierarchiesMap, isTenantLevelOperation } from "../utils/operation-util.js";
 import { AzurePollingDependencies } from "./external-dependencies.js";
 import { getPagingLROMethodName } from "./helpers/classical-operation-helpers.js";
@@ -68,19 +68,11 @@ export function buildClassicalClient(
   });
 
   // Add the private client member. This will be the client context from /api
-  if (isMultiEndpointClient(dpgContext)) {
-    clientClass.addProperty({
-      name: "_client",
-      type: `Client.${clientName}`,
-      scope: Scope.Private,
-    });
-  } else {
-    clientClass.addProperty({
-      name: "_client",
-      type: `${clientName}`,
-      scope: Scope.Private,
-    });
-  }
+  clientClass.addProperty({
+    name: "_client",
+    type: `${clientName}`,
+    scope: Scope.Private,
+  });
   // Add the pipeline member. This will be the pipeline from /api
   clientClass.addProperty({
     name: "pipeline",
@@ -145,9 +137,14 @@ export function buildClassicalClient(
       `this._clientParams = {${classicalParams.map((p) => p.name).join(",")}};`,
     );
     for (const childClient of client.children) {
-      const subfolder = normalizeName(childClient.name.replace("Client", ""), NameType.File);
+      const subfolder = normalizeSdkName(childClient, NameType.File, {
+        nameOverride: childClient.name.replace(/Client$/, ""),
+      });
       clientFile.addImportDeclaration({
-        moduleSpecifier: `./${subfolder}/${normalizeName(childClient.name, NameType.File)}.js`,
+        moduleSpecifier: `./${subfolder}/${normalizeName(
+          getClassicalClientName(childClient),
+          NameType.File,
+        )}.js`,
         namedImports: [
           `${getClassicalClientName(childClient)}`,
           `${getClassicalClientName(childClient)}OptionalParams`,
@@ -190,11 +187,10 @@ function importAllApis(clientFile: SourceFile, srcPath: string, subfolder: strin
 
 function generateMethod(
   context: SdkContext,
-  clientType: string,
   method: [string[], SdkServiceMethod<SdkServiceOperation>],
 ): MethodDeclarationStructure[] {
   const res: MethodDeclarationStructure[] = [];
-  const declaration = getOperationFunction(context, method, clientType);
+  const declaration = getOperationFunction(context, method, "Client");
   const methodName = declaration.propertyName ?? declaration.name ?? "FIXME";
   const methodParams = declaration.parameters?.filter((p) => p.name !== "context") ?? [];
   const declarationRefKey = resolveReference(refkey(method[1], "api"));
@@ -268,19 +264,14 @@ function buildClientOperationGroups(
   dpgContext: SdkContext,
   clientClass: ClassDeclaration,
 ) {
-  let clientType = "Client";
   const [_hierarchy, client] = clientMap;
-  const { subfolder } = getClientModuleInfo(clientMap);
-  if (subfolder && subfolder !== "") {
-    clientType = `Client.${clientClass.getName()}`;
-  }
   const methodMap = getMethodHierarchiesMap(dpgContext, client);
   for (const [prefixKey, operations] of methodMap) {
     const prefixes = prefixKey.split("/");
     const layer = 0;
     if (prefixKey === "") {
       operations.forEach((op) => {
-        const methods = generateMethod(dpgContext, clientType, [prefixes, op]);
+        const methods = generateMethod(dpgContext, [prefixes, op]);
         clientClass.addMethods(methods);
       });
     } else {
@@ -289,14 +280,12 @@ function buildClientOperationGroups(
       const operationName = `_get${rawGroupName}Operations`;
       const propertyType = `${rawGroupName}Operations`;
       // The `groupName` is used to any places where we don't need normalized name again
-      const groupName = normalizeName(rawGroupName, NameType.Property);
-      const existProperty = clientClass.getProperties().filter((p) => {
-        return p.getName() === normalizeName(groupName, NameType.Property);
-      });
-      if (!existProperty || existProperty.length === 0) {
+      const groupName = normalizeName(prefixes[0] ?? "", NameType.Property);
+      const existingProperty = clientClass.getProperty(groupName);
+      if (!existingProperty) {
         clientClass.addProperty({
           name: groupName,
-          type: resolveReference(refkey(propertyType, layer, "classicOperations")),
+          type: resolveReference(refkey(client, propertyType, layer, "classicOperations")),
           scope: Scope.Public,
           isReadonly: true,
           docs: ["The operation groups for " + groupName],
@@ -304,7 +293,7 @@ function buildClientOperationGroups(
         clientClass
           .getConstructors()[0]
           ?.addStatements(
-            `this.${groupName} = ${resolveReference(refkey(operationName, layer, "getClassicOperations"))}(this._client)`,
+            `this.${groupName} = ${resolveReference(refkey(client, operationName, layer, "getClassicOperations"))}(this._client)`,
           );
       }
     }

package/src/modular/build-operations.ts

@@ -22,9 +22,9 @@ import { addDeclaration } from "../framework/declaration.js";
 import { useDependencies } from "../framework/hooks/use-dependencies.js";
 import { resolveReference } from "../framework/reference.js";
 import { refkey } from "../framework/refkey.js";
-import { getClientModuleInfo, isMultiEndpointClient } from "../utils/client-utils.js";
+import { getClientModuleInfo } from "../utils/client-utils.js";
 import type { SdkContext } from "../utils/interfaces.js";
-import { NameType, normalizeName } from "../utils/name-utils.js";
+import { NameType, normalizeName, normalizeSdkName } from "../utils/name-utils.js";
 import {
   getMethodHierarchiesMap,
   hasDualFormatSupport,
@@ -49,8 +49,7 @@ export function buildOperationFiles(
   const [_, client] = clientMap;
   const operationFiles: Set<SourceFile> = new Set();
   const { subfolder, clientName } = getClientModuleInfo(clientMap);
-  const isMultiEndpoint = isMultiEndpointClient(dpgContext);
-  const clientType = isMultiEndpoint ? `Client.${clientName}` : "Client";
+  const clientType = "Client";
   const methodMap = getMethodHierarchiesMap(dpgContext, client);
   for (const [prefixKey, operations] of methodMap) {
     const prefixes = prefixKey.split("/");
@@ -187,7 +186,7 @@ export function buildOperationOptions(
           docs: getDocsFromDescription(p.doc),
           hasQuestionToken: true,
           type: getTypeExpression(context, p.type, { isOptional: true }),
-          name: normalizeName(p.name, NameType.Parameter),
+          name: normalizeSdkName(p, NameType.Parameter),
         };
       }),
     ),

package/src/modular/build-root-index.ts

@@ -278,7 +278,7 @@ function exportClassicalClient(
   subfolder: string,
   isSubClient: boolean = false,
 ) {
-  const clientName = client.name;
+  const clientName = getClassicalClientName(client);
   enqueueStatement(indexFile, {
     kind: StructureKind.ExportDeclaration,
     namedExports: [clientName],

package/src/modular/emit-models.ts

@@ -51,7 +51,14 @@ import { reportDiagnostic } from "../lib.js";
 import { getClientHierarchyMap } from "../utils/client-utils.js";
 import type { SdkContext } from "../utils/interfaces.js";
 import { isAzureCoreErrorType } from "../utils/model-utils.js";
-import { fixLeadingNumber, NameType, normalizeName } from "../utils/name-utils.js";
+import {
+  fixLeadingNumber,
+  formatPropertyName,
+  NameType,
+  normalizeName,
+  normalizeSdkName,
+  reportInvalidExactName,
+} from "../utils/name-utils.js";
 import { getMethodHierarchiesMap } from "../utils/operation-util.js";
 import { getHeaderClientOptions } from "./helpers/client-option-helpers.js";
 import {
@@ -314,6 +321,35 @@ export function getModelsPath(sourceRoot: string, modelNamespace: string[] = [])
   );
 }
 
+/** Finds the namespace prefix shared by every service in the package. */
+function getCommonServiceNamespace(context: SdkContext): string[] {
+  if (context.commonServiceNamespace) {
+    return context.commonServiceNamespace;
+  }
+
+  const serviceNamespaces = context.allServiceNamespaces ?? listAllServiceNamespaces(context);
+  if (serviceNamespaces.length === 0) {
+    context.commonServiceNamespace = [];
+    return context.commonServiceNamespace;
+  }
+
+  // Start with the first namespace and shorten it at the first segment that
+  // differs in each subsequent service namespace.
+  const commonNamespace = getNamespaceFullName(serviceNamespaces[0]!).split(".");
+  for (const serviceNamespace of serviceNamespaces.slice(1)) {
+    const segments = getNamespaceFullName(serviceNamespace).split(".");
+    const commonLength = commonNamespace.findIndex((segment, index) => segment !== segments[index]);
+    if (commonLength !== -1) {
+      commonNamespace.length = commonLength;
+    }
+    if (commonNamespace.length === 0) {
+      break;
+    }
+  }
+  context.commonServiceNamespace = commonNamespace;
+  return context.commonServiceNamespace;
+}
+
 export function getModelNamespaces(context: SdkContext, model: SdkType): string[] {
   if (model.kind === "model" || model.kind === "enum" || model.kind === "union") {
     if (
@@ -325,22 +361,11 @@ export function getModelNamespaces(context: SdkContext, model: SdkType): string[
       return [];
     }
     const segments = model.namespace.split(".");
-    // Keep full namespace segments if multiple services are present because there isn't a root namespace to trim
-    if (context.emitterOptions?.isMultiService) {
-      return segments;
-    }
-
-    const allServiceNamespaces = context.allServiceNamespaces ?? listAllServiceNamespaces(context);
-    const deepestNamespace = getNamespaceFullName(allServiceNamespaces[0]!);
-    const rootNamespace = deepestNamespace.split(".") ?? [];
-    if (segments.length > rootNamespace.length) {
-      while (segments[0] === rootNamespace[0]) {
-        segments.shift();
-        rootNamespace.shift();
-      }
-      return segments;
-    }
-    return [];
+    const commonNamespace = getCommonServiceNamespace(context);
+    const modelUsesCommonNamespace = commonNamespace.every(
+      (segment, index) => segment === segments[index],
+    );
+    return modelUsesCommonNamespace ? segments.slice(commonNamespace.length) : segments;
   } else if (model.kind === "array" || model.kind === "dict") {
     return getModelNamespaces(context, model.valueType);
   } else if (model.kind === "nullable") {
@@ -602,11 +627,15 @@ function emitEnumMember(
   member: SdkEnumValueType,
   reportMemberNameDiagnostic = false, // if reportMemberNameDiagnostic is true, it will report diagnostic for enum member name
 ): EnumMemberStructure {
-  const shouldNormalizeName = !member.name.startsWith("$DO_NOT_NORMALIZE$");
-  const enumTypeName = normalizeName(member.enumType.name, NameType.Interface, true);
-  let normalizedMemberName = context.emitterOptions?.ignoreEnumMemberNameNormalize
-    ? fixLeadingNumber(member.name, NameType.EnumMemberName) // need to fix the leading number also for enum member
-    : normalizeName(member.name, NameType.EnumMemberName, true);
+  const shouldNormalizeName = !member.isExactName && !member.name.startsWith("$DO_NOT_NORMALIZE$");
+  const enumTypeName = normalizeSdkName(member.enumType, NameType.Interface, {
+    shouldGuard: true,
+  });
+  let normalizedMemberName = member.isExactName
+    ? formatPropertyName(member.name)
+    : context.emitterOptions?.ignoreEnumMemberNameNormalize
+      ? fixLeadingNumber(member.name, NameType.EnumMemberName) // need to fix the leading number also for enum member
+      : normalizeSdkName(member, NameType.EnumMemberName, { shouldGuard: true });
   // If the member name starts with _ due to a leading digit (not because the original has _),
   // replace the _ prefix with either "V" (for API version enums) or the enum type name.
   if (
@@ -828,6 +857,8 @@ export function normalizeModelName(
     return getTypeExpression(context, type);
   }
 
+  reportInvalidExactName(context.program, type, nameType, type.kind, type.__raw ?? NoTarget);
+
   const segments = getModelNamespaces(context, type);
   let unionSuffix = "";
   if (!skipPolymorphicUnionSuffix) {
@@ -835,12 +866,15 @@ export function normalizeModelName(
       unionSuffix = "Union";
     }
   }
-  const namespacePrefix = context.emitterOptions?.enableModelNamespace ? segments.join("") : "";
+  const namespacePrefix = context.emitterOptions?.enableModelNamespace
+    ? normalizeName(segments.join(""), nameType)
+    : "";
   const internalModelPrefix =
     (isPagedResultModel(context, type) && !pagedModelsKeptPublic.has(type)) || type.isGeneratedName
       ? "_"
       : "";
-  return `${internalModelPrefix}${normalizeName(namespacePrefix + type.name, nameType, true)}${unionSuffix}`;
+  const modelName = normalizeSdkName(type, nameType, { shouldGuard: true });
+  return `${internalModelPrefix}${namespacePrefix}${modelName}${unionSuffix}`;
 }
 
 function buildModelPolymorphicType(context: SdkContext, type: SdkModelType) {
@@ -880,6 +914,7 @@ function buildModelProperty(
   const normalizedPropName = normalizeModelPropertyName(context, property);
   if (
     !context.emitterOptions?.ignorePropertyNameNormalize &&
+    !property.isExactName &&
     normalizedPropName !== `"${property.name}"`
   ) {
     reportDiagnostic(context.program, {