@azure-tools/typespec-ts 0.44.1 → 0.45.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.44.1",
+  "version": "0.45.1",
   "description": "An experimental TypeSpec emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -18,15 +18,15 @@
   "license": "MIT",
   "devDependencies": {
     "@azure-rest/core-client": "^2.3.1",
-    "@typespec/http-specs": "0.1.0-alpha.27-dev.0",
-    "@typespec/spector": "0.1.0-alpha.19-dev.0",
+    "@typespec/http-specs": "0.1.0-alpha.28-dev.0",
+    "@typespec/spector": "0.1.0-alpha.20-dev.0",
     "@typespec/spec-api": "0.1.0-alpha.10-dev.0",
-    "@typespec/tspd": "0.72.1",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.29-dev.0",
-    "@azure-tools/typespec-autorest": "^0.60.0",
-    "@azure-tools/typespec-azure-core": "^0.60.0",
-    "@azure-tools/typespec-azure-resource-manager": "^0.60.0",
-    "@azure-tools/typespec-client-generator-core": "^0.60.3",
+    "@typespec/tspd": "0.73.0",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.31-dev.0",
+    "@azure-tools/typespec-autorest": "^0.61.0",
+    "@azure-tools/typespec-azure-core": "^0.61.0",
+    "@azure-tools/typespec-azure-resource-manager": "^0.61.0",
+    "@azure-tools/typespec-client-generator-core": "^0.61.0",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
@@ -41,12 +41,12 @@
     "@types/node": "^18.0.0",
     "@typescript-eslint/eslint-plugin": "^8.28.0",
     "@typescript-eslint/parser": "^8.28.0",
-    "@typespec/compiler": "^1.4.0",
-    "@typespec/http": "^1.4.0",
-    "@typespec/openapi": "^1.4.0",
-    "@typespec/rest": "^0.74.0",
+    "@typespec/compiler": "^1.5.0",
+    "@typespec/http": "^1.5.0",
+    "@typespec/openapi": "^1.5.0",
+    "@typespec/rest": "^0.75.0",
     "@typespec/ts-http-runtime": "^0.1.0",
-    "@typespec/versioning": "^0.74.0",
+    "@typespec/versioning": "^0.75.0",
     "chai": "^4.3.6",
     "chalk": "^4.0.0",
     "cross-env": "^7.0.3",
@@ -68,16 +68,16 @@
     "js-yaml": "^4.1.0"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": "^0.60.0",
-    "@azure-tools/typespec-client-generator-core": "^0.60.3",
-    "@typespec/compiler": "^1.4.0",
-    "@typespec/http": "^1.4.0",
-    "@typespec/rest": "^0.74.0",
-    "@typespec/versioning": "^0.74.0",
-    "@typespec/xml": "^0.74.0"
+    "@azure-tools/typespec-azure-core": "^0.61.0",
+    "@azure-tools/typespec-client-generator-core": "^0.61.0",
+    "@typespec/compiler": "^1.5.0",
+    "@typespec/http": "^1.5.0",
+    "@typespec/rest": "^0.75.0",
+    "@typespec/versioning": "^0.75.0",
+    "@typespec/xml": "^0.75.0"
   },
   "dependencies": {
-    "@azure-tools/rlc-common": "^0.44.1",
+    "@azure-tools/rlc-common": "^0.45.1",
     "fs-extra": "^11.1.0",
     "lodash": "^4.17.21",
     "prettier": "^3.3.3",

package/src/index.ts

@@ -334,7 +334,7 @@ export async function $onEmit(context: EmitContext) {
         interfaceOnly: true
       });
       if (isMultiClients) {
-        buildSubClientIndexFile(subClient, modularEmitterOptions);
+        buildSubClientIndexFile(dpgContext, subClient, modularEmitterOptions);
       }
       buildRootIndex(
         dpgContext,

package/src/lib.ts

@@ -540,6 +540,48 @@ const libDef = {
       messages: {
         default: paramMessage`The parameter name ${"parameterName"} has conflicts with others and please use @clientName to rename it.`
       }
+    },
+    "unsupported-parameter-type": {
+      severity: "error",
+      messages: {
+        default: paramMessage`Parameter '${"paramName"}' with kind '${"paramKind"}' is not supported.`
+      }
+    },
+    "unknown-sdk-method-kind": {
+      severity: "error",
+      messages: {
+        default: paramMessage`Unknown SDK method kind: '${"methodKind"}'.`
+      }
+    },
+    "client-file-not-found": {
+      severity: "error",
+      messages: {
+        default: paramMessage`Client file not found: '${"filePath"}'.`
+      }
+    },
+    "anonymous-type-serialization": {
+      severity: "error",
+      messages: {
+        default: "Serialization of anonymous types is not yet implemented."
+      }
+    },
+    "anonymous-type-deserialization": {
+      severity: "error",
+      messages: {
+        default: "Deserialization of anonymous types is not yet implemented."
+      }
+    },
+    "lro-polling-config-error": {
+      severity: "error",
+      messages: {
+        default: paramMessage`LRO polling configuration error: ${"message"}.`
+      }
+    },
+    "file-formatting-error": {
+      severity: "error",
+      messages: {
+        default: paramMessage`Failed to format file: ${"filePath"}. Error: ${"error"}.`
+      }
     }
   },
   emitter: {

package/src/modular/buildRootIndex.ts

@@ -17,6 +17,8 @@ import { getModularClientOptions } from "../utils/clientUtils.js";
 import { getMethodHierarchiesMap } from "../utils/operationUtil.js";
 import { join } from "path/posix";
 import { useContext } from "../contextManager.js";
+import { reportDiagnostic } from "../lib.js";
+import { NoTarget } from "@typespec/compiler";
 
 export function buildRootIndex(
   context: SdkContext,
@@ -42,12 +44,14 @@ export function buildRootIndex(
   );
 
   if (!clientFile) {
-    throw new Error(
-      `Couldn't find client file: ${srcPath}/${normalizeName(
-        clientName,
-        NameType.File
-      )}.ts`
-    );
+    reportDiagnostic(context.program, {
+      code: "client-file-not-found",
+      format: {
+        filePath: `${srcPath}/${normalizeName(clientName, NameType.File)}.ts`
+      },
+      target: NoTarget
+    });
+    return; // Skip exporting this client but continue with others
   }
 
   exportClassicalClient(client, rootIndexFile, subfolder ?? "");
@@ -346,6 +350,7 @@ function exportModules(
 }
 
 export function buildSubClientIndexFile(
+  context: SdkContext,
   clientMap: [string[], SdkClientType<SdkServiceOperation>],
   emitterOptions: ModularEmitterOptions
 ) {
@@ -365,7 +370,14 @@ export function buildSubClientIndexFile(
   const clientFile = project.getSourceFile(clientFilePath);
 
   if (!clientFile) {
-    throw new Error(`Couldn't find client file: ${clientFilePath}`);
+    reportDiagnostic(context.program, {
+      code: "client-file-not-found",
+      format: {
+        filePath: clientFilePath
+      },
+      target: NoTarget
+    });
+    return; // Skip exporting this client but continue with others
   }
 
   exportClassicalClient(client, subClientIndexFile, subfolder ?? "", true);

package/src/modular/emitModels.ts

@@ -46,10 +46,7 @@ import path from "path";
 import { refkey } from "../framework/refkey.js";
 import { useContext } from "../contextManager.js";
 import { isMetadata, isOrExtendsHttpFile } from "@typespec/http";
-import {
-  isAzureCoreErrorType,
-  isAzureCoreLroType
-} from "../utils/modelUtils.js";
+import { isAzureCoreErrorType } from "../utils/modelUtils.js";
 import { isExtensibleEnum } from "./type-expressions/get-enum-expression.js";
 import {
   getAllDiscriminatedValues,
@@ -109,9 +106,6 @@ export function emitTypes(
     if (!isGenerableType(type)) {
       continue;
     }
-    if (isAzureCoreLroType(type.__raw)) {
-      continue;
-    }
 
     const namespaces = getModelNamespaces(context, type);
     const filepath = getModelsPath(sourceRoot, namespaces);
@@ -793,7 +787,14 @@ function visitClientMethod(
       visitOperation(context, method.operation);
       break;
     default:
-      throw new Error(`Unknown sdk method kind: ${(method as any).kind}`);
+      reportDiagnostic(context.program, {
+        code: "unknown-sdk-method-kind",
+        format: {
+          methodKind: (method as any).kind
+        },
+        target: NoTarget
+      });
+      return; // Skip processing this method but continue with others
   }
 }
 

package/src/modular/emitSamples.ts

@@ -425,6 +425,12 @@ function getParameterValue(value: SdkExampleValue): string {
         case "utcDateTime":
           retValue = `new Date("${value.value}")`;
           break;
+        case "bytes": {
+          const encode = value.type.encode ?? "base64";
+          // TODO: add check for un-supported encode
+          retValue = `Buffer.from("${value.value}",  "${encode}")`;
+          break;
+        }
         default:
           retValue = `"${value.value
             ?.toString()
@@ -454,11 +460,9 @@ function getParameterValue(value: SdkExampleValue): string {
       const additionalPropertiesValue =
         value.kind === "model" ? (value.additionalPropertiesValue ?? {}) : {};
       for (const propName in {
-        ...value.value,
-        ...additionalPropertiesValue
+        ...value.value
       }) {
-        const propValue =
-          value.value[propName] ?? additionalPropertiesValue[propName];
+        const propValue = value.value[propName];
         if (propValue === undefined || propValue === null) {
           continue;
         }
@@ -467,6 +471,27 @@ function getParameterValue(value: SdkExampleValue): string {
           getParameterValue(propValue);
         values.push(propRetValue);
       }
+      const additionalBags = [];
+      for (const propName in {
+        ...additionalPropertiesValue
+      }) {
+        const propValue = additionalPropertiesValue[propName];
+        if (propValue === undefined || propValue === null) {
+          continue;
+        }
+        const propRetValue =
+          `"${mapper.get(propName) ?? propName}": ` +
+          getParameterValue(propValue);
+        additionalBags.push(propRetValue);
+      }
+      if (additionalBags.length > 0) {
+        const name = mapper.get("additionalProperties")
+          ? "additionalPropertiesBag"
+          : "additionalProperties";
+        values.push(`"${name}": {
+          ${additionalBags.join(", ")}
+          }`);
+      }
 
       retValue = `{${values.join(", ")}}`;
       break;

package/src/modular/helpers/operationHelpers.ts

@@ -850,7 +850,17 @@ export function getParameterMap(
     return getRequired(context, param);
   }
 
-  throw new Error(`Parameter ${param.name} is not supported`);
+  reportDiagnostic(context.program, {
+    code: "unsupported-parameter-type",
+    format: {
+      paramName: param.name,
+      paramKind: param.kind
+    },
+    target: param.__raw || NoTarget
+  });
+
+  // Return a fallback value to allow the emitter to continue
+  return `"${param.name}": undefined`;
 }
 
 function getCollectionFormat(

package/src/modular/serialization/buildDeserializerFunction.ts

@@ -32,6 +32,8 @@ import {
   getAdditionalPropertiesType,
   getDirectSubtypes
 } from "../helpers/typeHelpers.js";
+import { reportDiagnostic } from "../../lib.js";
+import { NoTarget } from "@typespec/compiler";
 
 export function buildModelDeserializer(
   context: SdkContext,
@@ -106,7 +108,11 @@ function buildPolymorphicDeserializer(
   nameOnly = false
 ): FunctionDeclarationStructure | undefined | string {
   if (!type.name) {
-    throw new Error(`NYI Serialization of anonymous types`);
+    reportDiagnostic(context.program, {
+      code: "anonymous-type-deserialization",
+      target: type.__raw || NoTarget
+    });
+    return undefined; // Return undefined to skip this deserialization
   }
   const deserializeFunctionName = `${normalizeModelName(
     context,
@@ -150,8 +156,12 @@ function buildPolymorphicDeserializer(
       return;
     }
     const union = subType?.discriminatedSubtypes ? "_Union" : "";
-    if (!subType || subType?.name) {
-      throw new Error(`NYI Serialization of anonymous types`);
+    if (!subType || !subType?.name) {
+      reportDiagnostic(context.program, {
+        code: "anonymous-type-deserialization",
+        target: subType?.__raw || NoTarget
+      });
+      return; // Skip this subtype
     }
 
     const rawSubTypeName = `${subType.name}${union}`;
@@ -194,7 +204,11 @@ function buildDiscriminatedUnionDeserializer(
   nameOnly = false
 ): FunctionDeclarationStructure | undefined | string {
   if (!type.name) {
-    throw new Error(`NYI Serialization of anonymous types`);
+    reportDiagnostic(context.program, {
+      code: "anonymous-type-deserialization",
+      target: type.__raw || NoTarget
+    });
+    return undefined; // Return undefined to skip this deserialization
   }
   const cases: string[] = [];
   const output: string[] = [];
@@ -279,7 +293,11 @@ function buildUnionDeserializer(
   nameOnly = false
 ): FunctionDeclarationStructure | string | undefined {
   if (!type.name) {
-    throw new Error(`NYI Serialization of anonymous types`);
+    reportDiagnostic(context.program, {
+      code: "anonymous-type-deserialization",
+      target: type.__raw || NoTarget
+    });
+    return ""; // Return empty string to continue processing
   }
   const deserializerFunctionName = `${normalizeModelName(
     context,
@@ -314,7 +332,11 @@ function buildModelTypeDeserializer(
   }
 ): FunctionDeclarationStructure | string | undefined {
   if (!type.name) {
-    throw new Error(`NYI Deserialization of anonymous types`);
+    reportDiagnostic(context.program, {
+      code: "anonymous-type-deserialization",
+      target: type.__raw || NoTarget
+    });
+    return ""; // Return empty string to continue processing
   }
   const deserializerFunctionName = `${normalizeModelName(
     context,

package/src/modular/serialization/buildSerializerFunction.ts

@@ -38,6 +38,8 @@ import {
   getAdditionalPropertiesType,
   getDirectSubtypes
 } from "../helpers/typeHelpers.js";
+import { reportDiagnostic } from "../../lib.js";
+import { NoTarget } from "@typespec/compiler";
 
 export function buildModelSerializer(
   context: SdkContext,
@@ -114,7 +116,11 @@ function buildPolymorphicSerializer(
   nameOnly = false
 ): FunctionDeclarationStructure | undefined | string {
   if (!type.name) {
-    throw new Error(`NYI Serialization of anonymous types`);
+    reportDiagnostic(context.program, {
+      code: "anonymous-type-serialization",
+      target: type.__raw || NoTarget
+    });
+    return undefined; // Return undefined to skip this serialization
   }
   const serializeFunctionName = `${normalizeModelName(
     context,
@@ -158,8 +164,12 @@ function buildPolymorphicSerializer(
       return;
     }
     const union = subType?.discriminatedSubtypes ? "_Union" : "";
-    if (!subType || subType?.name) {
-      throw new Error(`NYI Serialization of anonymous types`);
+    if (!subType || !subType?.name) {
+      reportDiagnostic(context.program, {
+        code: "anonymous-type-serialization",
+        target: subType?.__raw || NoTarget
+      });
+      return; // Skip this subtype
     }
     const rawSubTypeName = `${subType.name}${union}`;
     const subTypeName = `${normalizeName(rawSubTypeName, NameType.Interface, true)}`;
@@ -201,7 +211,11 @@ function buildDiscriminatedUnionSerializer(
   nameOnly = false
 ): FunctionDeclarationStructure | undefined | string {
   if (!type.name) {
-    throw new Error(`NYI Serialization of anonymous types`);
+    reportDiagnostic(context.program, {
+      code: "anonymous-type-serialization",
+      target: type.__raw || NoTarget
+    });
+    return undefined; // Return undefined to skip this serialization
   }
   const cases: string[] = [];
   const output: string[] = [];
@@ -286,7 +300,11 @@ function buildUnionSerializer(
   nameOnly = false
 ): FunctionDeclarationStructure | string {
   if (!type.name) {
-    throw new Error(`NYI Serialization of anonymous types`);
+    reportDiagnostic(context.program, {
+      code: "anonymous-type-serialization",
+      target: type.__raw || NoTarget
+    });
+    return ""; // Return empty string to continue processing
   }
   const serializerFunctionName = `${normalizeModelName(
     context,
@@ -321,7 +339,11 @@ function buildModelTypeSerializer(
   }
 ): FunctionDeclarationStructure | string {
   if (!type.name) {
-    throw new Error(`NYI Deserialization of anonymous types`);
+    reportDiagnostic(context.program, {
+      code: "anonymous-type-deserialization",
+      target: type.__raw || NoTarget
+    });
+    return ""; // Return empty string to continue processing
   }
   const serializerFunctionName = `${normalizeModelName(
     context,

package/src/transform/transformApiVersionInfo.ts

@@ -75,7 +75,8 @@ export function getOperationApiVersion(
     }
     const params = route.parameters.parameters.filter(
       (p) =>
-        (p.type === "query" || p.type === "path") && isApiVersion(dpgContext, p)
+        (p.type === "query" || p.type === "path") &&
+        isApiVersion(dpgContext, p.param)
     );
     params.map((p) => {
       const type = getSchemaForType(dpgContext, p.param.type, {

package/src/transform/transformParameters.ts

@@ -225,7 +225,7 @@ function transformQueryParameters(
     (p) =>
       p.type === "query" &&
       !(
-        isApiVersion(dpgContext, p) &&
+        isApiVersion(dpgContext, p.param) &&
         options.apiVersionInfo?.definedPosition === "query"
       )
   );

package/src/transform/transformPaths.ts

@@ -167,7 +167,7 @@ function hasRequiredOptions(
 
   const containsRequiredNonBodyParam = routeParameters.parameters
     .filter((parameter) => ["query", "header"].includes(parameter.type))
-    .filter((parameter) => !isApiVersion(dpgContext, parameter))
+    .filter((parameter) => !isApiVersion(dpgContext, parameter.param))
     .filter((parameter) => !!parameter.param)
     .some((parameter) => parameter.param.optional === false);
   return isRequiredBodyParam || containsRequiredNonBodyParam;

package/src/transform/transfromRLCOptions.ts

@@ -91,8 +91,6 @@ function extractRLCOptions(
     emitterOptions["compatibility-query-multi-format"];
   const typespecTitleMap = emitterOptions["typespec-title-map"];
   const hasSubscriptionId = getSubscriptionId(dpgContext);
-  //TODO should remove this after finish the release tool test
-  const shouldUsePnpmDep = emitterOptions["should-use-pnpm-dep"];
 
   return {
     ...credentialInfo,
@@ -124,9 +122,7 @@ function extractRLCOptions(
     compatibilityQueryMultiFormat,
     typespecTitleMap,
     ignoreEnumMemberNameNormalize,
-    hasSubscriptionId,
-    //TODO should remove this after finish the release tool test
-    shouldUsePnpmDep
+    hasSubscriptionId
   };
 }
 

package/src/utils/emitUtil.ts

@@ -5,10 +5,14 @@ import {
   isAzurePackage,
   RLCModel
 } from "@azure-tools/rlc-common";
-import { CompilerHost, Program } from "@typespec/compiler";
+import { CompilerHost, Program, NoTarget } from "@typespec/compiler";
 import { dirname, join } from "path";
 import { format } from "prettier";
-import { prettierJSONOptions, prettierTypeScriptOptions } from "../lib.js";
+import {
+  prettierJSONOptions,
+  prettierTypeScriptOptions,
+  reportDiagnostic
+} from "../lib.js";
 
 export async function emitModels(rlcModels: RLCModel, program: Program) {
   const schemaOutput = buildSchemaTypes(rlcModels);
@@ -78,8 +82,16 @@ async function emitFile(
         isJson ? prettierJSONOptions : prettierTypeScriptOptions
       );
     } catch (e) {
-      console.error(`Failed to format file: ${filePath}`);
-      throw e;
+      reportDiagnostic(program, {
+        code: "file-formatting-error",
+        format: {
+          filePath: filePath,
+          error: String(e)
+        },
+        target: NoTarget
+      });
+      // Continue with unformatted content rather than crashing
+      console.error(`Failed to format file: ${filePath}`, e);
     }
   }
   await host.mkdirp(dirname(filePath));

package/src/utils/modelUtils.ts

@@ -79,10 +79,7 @@ import {
   getWireName,
   isApiVersion
 } from "@azure-tools/typespec-client-generator-core";
-import {
-  getPagedResult,
-  getUnionAsEnum
-} from "@azure-tools/typespec-azure-core";
+import { getUnionAsEnum } from "@azure-tools/typespec-azure-core";
 
 import { getModelNamespaceName } from "./namespaceUtils.js";
 import { reportDiagnostic } from "../lib.js";
@@ -924,7 +921,7 @@ function getModelName(dpgContext: SdkContext, model: Model) {
   // 4. check if this is a model with template arguments
   let name = model.name;
   if (model.templateMapper?.args) {
-    const isPage = getPagedResult(program, model);
+    // const isPage = getPagedResult(program, model);
     const templateTypeNames = model.templateMapper.args
       .map((arg) => (arg.entityKind === "Indeterminate" ? arg.type : arg))
       .map((arg: any) => {
@@ -944,10 +941,7 @@ function getModelName(dpgContext: SdkContext, model: Model) {
       })
       .filter((arg) => arg !== "")
       .join(" ");
-    name = normalizeName(
-      isPage ? `${templateTypeNames} List` : `${name} ${templateTypeNames}`,
-      NameType.Interface
-    );
+    name = normalizeName(`${name} ${templateTypeNames}`, NameType.Interface);
   }
   let fullNamespacePrefix = getModelNamespaceName(dpgContext, model.namespace!)
     .map((nsName) => {
@@ -1714,14 +1708,6 @@ export function trimUsage(model: any) {
   return ordered;
 }
 
-export function buildCoreTypeInfo(program: Program, t?: Type) {
-  return isAzureCoreErrorType(program, t)
-    ? "ErrorType"
-    : isAzureCoreLroType(t)
-      ? "LroType"
-      : undefined;
-}
-
 export function isAzureCoreErrorType(program: Program, t?: Type): boolean {
   if (!t || t.kind !== "Model") {
     return false;
@@ -1737,26 +1723,6 @@ export function isAzureCoreErrorType(program: Program, t?: Type): boolean {
   return isAzureCoreFoundationsNamespace(effective);
 }
 
-// Check if the type in the Azure.Core.Foundations has an LRO type in core
-export function isAzureCoreLroType(t?: Type): boolean {
-  if (
-    !(
-      ((t?.kind === "Enum" || t?.kind === "Union") &&
-        ["operationstate"].includes((t.name ?? "").toLowerCase())) ||
-      (t?.kind === "Model" &&
-        ["resourceoperationstatus", "operationstatus"].includes(
-          t.name.toLowerCase()
-        ))
-    )
-  ) {
-    return false;
-  }
-  return (
-    isAzureCoreFoundationsNamespace(t) ||
-    isAzureCoreFoundationsNamespace(t, true)
-  );
-}
-
 function isAzureCoreFoundationsNamespace(
   t?: Type,
   skipFoundation: boolean = false