@azure-tools/typespec-ts 0.40.2 → 0.41.0-alpha.20250610.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.40.2",
+  "version": "0.41.0-alpha.20250610.1",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -18,13 +18,13 @@
   "license": "MIT",
   "devDependencies": {
     "@azure-rest/core-client": "^2.3.1",
-    "@typespec/http-specs": "0.1.0-alpha.22-dev.0",
-    "@typespec/spector": "0.1.0-alpha.14-dev.1",
-    "@typespec/spec-api": "0.1.0-alpha.7-dev.0",
-    "@azure-tools/azure-http-specs": "^0.1.0-alpha.17-dev.0",
+    "@typespec/http-specs": "0.1.0-alpha.22",
+    "@typespec/spector": "0.1.0-alpha.14",
+    "@typespec/spec-api": "0.1.0-alpha.6",
+    "@azure-tools/azure-http-specs": "^0.1.0-alpha.18",
     "@azure-tools/typespec-autorest": "^0.56.0",
     "@azure-tools/typespec-azure-core": "^0.56.0",
-    "@azure-tools/typespec-azure-resource-manager": "^0.56.1",
+    "@azure-tools/typespec-azure-resource-manager": "^0.56.2",
     "@azure-tools/typespec-client-generator-core": "^0.56.2",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
@@ -76,7 +76,7 @@
     "@typespec/xml": "^0.70.0"
   },
   "dependencies": {
-    "@azure-tools/rlc-common": "^0.40.2",
+    "@azure-tools/rlc-common": "0.41.0-alpha.20250610.1",
     "fs-extra": "^11.1.0",
     "lodash": "^4.17.21",
     "prettier": "^3.3.3",

package/src/index.ts

@@ -295,6 +295,10 @@ export async function $onEmit(context: EmitContext) {
     });
     console.time("onEmit: emit source files");
     const clientMap = getClientHierarchyMap(dpgContext);
+    if (clientMap.length === 0) {
+      // If no clients, we still need to build the root index file
+      buildRootIndex(dpgContext, modularEmitterOptions, rootIndexFile);
+    }
     for (const subClient of clientMap) {
       await renameClientName(subClient[1], modularEmitterOptions);
       buildApiOptions(dpgContext, subClient, modularEmitterOptions);
@@ -324,9 +328,9 @@ export async function $onEmit(context: EmitContext) {
       }
       buildRootIndex(
         dpgContext,
-        subClient,
         modularEmitterOptions,
-        rootIndexFile
+        rootIndexFile,
+        subClient
       );
     }
     console.timeEnd("onEmit: emit source files");

package/src/modular/buildRootIndex.ts

@@ -16,10 +16,15 @@ import { useContext } from "../contextManager.js";
 
 export function buildRootIndex(
   context: SdkContext,
-  clientMap: [string[], SdkClientType<SdkServiceOperation>],
   emitterOptions: ModularEmitterOptions,
-  rootIndexFile: SourceFile
+  rootIndexFile: SourceFile,
+  clientMap?: [string[], SdkClientType<SdkServiceOperation>]
 ) {
+  if (!clientMap) {
+    // we still need to export the models if no client is provided
+    exportModels(emitterOptions, rootIndexFile);
+    return;
+  }
   const project = useContext("outputProject");
   const [_, client] = clientMap;
   const srcPath = emitterOptions.modularOptions.sourceRoot;
@@ -50,17 +55,7 @@ export function buildRootIndex(
     subfolder,
     true
   );
-  const modelsExportsIndex = rootIndexFile
-    .getExportDeclarations()
-    ?.find((i) => {
-      return i.getModuleSpecifierValue()?.startsWith(`./models/`);
-    });
-  if (!modelsExportsIndex) {
-    exportModules(rootIndexFile, project, srcPath, clientName, "models", {
-      isTopLevel: true,
-      recursive: true
-    });
-  }
+  exportModels(emitterOptions, rootIndexFile, clientName);
   exportModules(rootIndexFile, project, srcPath, clientName, "api", {
     subfolder,
     interfaceOnly: true,
@@ -75,6 +70,27 @@ export function buildRootIndex(
   exportFileContentsType(context, rootIndexFile);
 }
 
+function exportModels(
+  emitterOptions: ModularEmitterOptions,
+  rootIndexFile: SourceFile,
+  clientName: string = ""
+) {
+  // export models index file if not exists
+  const project = useContext("outputProject");
+  const srcPath = emitterOptions.modularOptions.sourceRoot;
+  const modelsExportsIndex = rootIndexFile
+    .getExportDeclarations()
+    ?.find((i) => {
+      return i.getModuleSpecifierValue()?.startsWith(`./models/`);
+    });
+  if (!modelsExportsIndex) {
+    exportModules(rootIndexFile, project, srcPath, clientName, "models", {
+      isTopLevel: true,
+      recursive: true
+    });
+  }
+}
+
 /**
  * This is a temporary solution for adding paging exports. Eventually we will have the binder generate the exports automatically.
  */

package/src/modular/emitModels.ts

@@ -314,26 +314,9 @@ function addSerializationFunctions(
     type,
     skipDiscriminatedUnion
   );
-  let typeName = undefined;
-  switch (type.kind) {
-    case "array":
-      typeName = "array";
-      break;
-    case "dict":
-      typeName = "record";
-      break;
-    default:
-      break;
-  }
 
-  const serializerRefkey =
-    type.kind === "array" || type.kind === "dict"
-      ? refkey(type.valueType, typeName, "serializer")
-      : refkey(type, "serializer");
-  const deserailizerRefKey =
-    type.kind === "array" || type.kind === "dict"
-      ? refkey(type.valueType, typeName, "deserializer")
-      : refkey(type, "deserializer");
+  const serializerRefkey = refkey(type, "serializer");
+  const deserailizerRefKey = refkey(type, "deserializer");
   if (
     serializationFunction &&
     typeof serializationFunction !== "string" &&

package/src/modular/emitSamples.ts

@@ -237,9 +237,7 @@ function emitMethodSamples(
 function buildParameterValueMap(example: SdkHttpOperationExample) {
   const parameterMap: Record<string, SdkHttpParameterExampleValue> = {};
   example.parameters.forEach(
-    (param) =>
-      (parameterMap[param.parameter.serializedName ?? param.parameter.name] =
-        param)
+    (param) => (parameterMap[param.parameter.serializedName] = param)
   );
   return parameterMap;
 }
@@ -312,7 +310,7 @@ function prepareExampleParameters(
   }
   // required/optional body parameters
   const bodyParam = method.operation.bodyParam;
-  const bodyName = bodyParam?.name;
+  const bodyName = bodyParam?.serializedName;
   const bodyExample = parameterMap[bodyName ?? ""];
   if (bodyName && bodyExample && bodyExample.value) {
     if (

package/src/modular/serialization/buildDeserializerFunction.ts

@@ -424,7 +424,7 @@ function buildDictTypeDeserializer(
 
   const deserializerFunctionName = `${normalizeModelName(context, type, NameType.Operation, false, true)}Deserializer`;
   if (nameOnly) {
-    return resolveReference(refkey(type.valueType, "record", "deserializer"));
+    return resolveReference(refkey(type, "deserializer"));
   }
   const deserializerFunction: FunctionDeclarationStructure = {
     kind: StructureKind.Function,
@@ -482,7 +482,7 @@ function buildArrayTypeDeserializer(
   }
   const deserializerFunctionName = `${normalizeModelName(context, type, NameType.Operation, false, true)}Deserializer`;
   if (nameOnly) {
-    return resolveReference(refkey(type.valueType, "array", "deserializer"));
+    return resolveReference(refkey(type, "deserializer"));
   }
   const serializerFunction: FunctionDeclarationStructure = {
     kind: StructureKind.Function,

package/src/modular/serialization/buildSerializerFunction.ts

@@ -488,7 +488,7 @@ function buildDictTypeSerializer(
   }
   const serializerFunctionName = `${normalizeModelName(context, type, NameType.Operation, false, true)}Serializer`;
   if (nameOnly) {
-    return resolveReference(refkey(type.valueType, "record", "serializer"));
+    return resolveReference(refkey(type, "serializer"));
   }
   const serializerFunction: FunctionDeclarationStructure = {
     kind: StructureKind.Function,
@@ -546,7 +546,7 @@ function buildArrayTypeSerializer(
   }
   const serializerFunctionName = `${normalizeModelName(context, type, NameType.Operation, false, true)}Serializer`;
   if (nameOnly) {
-    return resolveReference(refkey(type.valueType, "array", "serializer"));
+    return resolveReference(refkey(type, "serializer"));
   }
   const serializerFunction: FunctionDeclarationStructure = {
     kind: StructureKind.Function,

package/src/utils/modelUtils.ts

@@ -519,7 +519,7 @@ function isOasString(type: Type): boolean {
   if (type.kind === "String") {
     // A string literal
     return true;
-  } else if (type.kind === "Model" && type.name === "string") {
+  } else if (type.kind === "Scalar" && type.name === "string") {
     // string type
     return true;
   } else if (type.kind === "Union") {