@azure-tools/typespec-ts 0.13.1 → 0.13.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "An experimental CADL emitter for TypeScript RLC",
   "main": "dist/src/index.js",
   "type": "module",
@@ -14,7 +14,6 @@
     "@types/fs-extra": "^9.0.13",
     "@typescript-eslint/eslint-plugin": "^5.58.0",
     "@typescript-eslint/parser": "^5.58.0",
-    "@typespec/http": "~0.44.0",
     "chai": "^4.3.6",
     "mkdirp": "^2.1.2",
     "eslint": "^8.9.0",
@@ -23,10 +22,9 @@
     "ts-node": "^10.9.1",
     "typescript": "~5.0.0",
     "prettier": "~2.7.1",
-    "@azure-tools/cadl-ranch-specs": "~0.15.4",
-    "@typespec/versioning": "~0.44.0",
+    "@azure-tools/cadl-ranch-specs": "^0.15.4",
     "@azure-tools/cadl-ranch-expect": "^0.3.2",
-    "@azure-tools/cadl-ranch": "~0.4.17",
+    "@azure-tools/cadl-ranch": "^0.4.17",
     "chalk": "^4.0.0",
     "@azure-rest/core-client": "^1.1.3",
     "@azure/core-auth": "^1.3.2",
@@ -37,17 +35,17 @@
     "@azure/logger": "^1.0.4"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.30.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.30.0 <1.0.0",
-    "@typespec/compiler": ">=0.44.0 <1.0.0",
-    "@typespec/http": ">=0.44.0 <1.0.0",
-    "@typespec/rest": ">=0.44.0 <1.0.0",
-    "@typespec/versioning": ">=0.44.0 <1.0.0"
+    "@azure-tools/typespec-azure-core": ">=0.31.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.31.0 <1.0.0",
+    "@typespec/compiler": ">=0.45.0 <1.0.0",
+    "@typespec/http": ">=0.45.0 <1.0.0",
+    "@typespec/rest": ">=0.45.0 <1.0.0",
+    "@typespec/versioning": ">=0.45.0 <1.0.0"
   },
   "dependencies": {
     "prettier": "^2.6.1",
     "tslib": "^2.3.1",
-    "@azure-tools/rlc-common": "^0.13.1",
+    "@azure-tools/rlc-common": "^0.13.2",
     "ts-morph": "^15.1.0",
     "fs-extra": "^11.1.0"
   },

package/src/modelUtils.ts

@@ -453,6 +453,8 @@ function getSchemaForModel(
     true /** shouldGuard */
   );
 
+  modelSchema.typeName = modelSchema.name;
+  
   if (
     (model.name === "ErrorResponse" ||
       model.name === "ErrorModel" ||

package/src/modular/helpers/namingHelpers.ts

@@ -1,5 +1,6 @@
 import { toCamelCase, toPascalCase } from "../../casingUtils.js";
 import { Client, Operation } from "../modularCodeModel.js";
+import { ReservedModelNames, NameType, normalizeName } from "@azure-tools/rlc-common";
 
 export function getClientName(client: Client) {
   return client.name.replace(/Client$/, "");
@@ -17,7 +18,7 @@ export function getOperationName(
   const casingFn = options.casing === "camel" ? toCamelCase : toPascalCase;
   if (isReservedName(operation.name, NameType.Operation)) {
     return {
-      name: `${operation.name}Operation`,
+      name: normalizeName(operation.name, NameType.Operation, true),
       fixme: [
         `${operation.name} is a reserved word that cannot be used as an operation name. Please add @projectedName(
       "javascript", "<JS-Specific-Name>") to the operation to override the generated name.`
@@ -31,95 +32,8 @@ export function getOperationName(
 }
 
 export function isReservedName(name: string, nameType: NameType): boolean {
-  return RESERVED_NAMES.some(
+  return ReservedModelNames.some(
     (reservedName) =>
       reservedName.name === name && reservedName.reservedFor.includes(nameType)
   );
 }
-
-interface ReservedName {
-  name: string;
-  reservedFor: NameType[];
-}
-
-enum NameType {
-  Class,
-  File,
-  Interface,
-  Property,
-  Parameter,
-  Operation,
-  OperationGroup
-}
-
-const Newable = [NameType.Class, NameType.Interface, NameType.OperationGroup];
-
-const RESERVED_NAMES: ReservedName[] = [
-  { name: "any", reservedFor: [NameType.Parameter] },
-  { name: "as", reservedFor: [NameType.Parameter] },
-  { name: "boolean", reservedFor: [NameType.Parameter, ...Newable] },
-  { name: "break", reservedFor: [NameType.Parameter] },
-  { name: "case", reservedFor: [NameType.Parameter] },
-  { name: "catch", reservedFor: [NameType.Parameter] },
-  { name: "class", reservedFor: [NameType.Parameter] },
-  { name: "const", reservedFor: [NameType.Parameter] },
-  { name: "constructor", reservedFor: [NameType.Parameter] },
-  { name: "continue", reservedFor: [NameType.Parameter] },
-  { name: "date", reservedFor: [NameType.Parameter, ...Newable] },
-  { name: "debugger", reservedFor: [NameType.Parameter] },
-  { name: "declare", reservedFor: [NameType.Parameter] },
-  { name: "default", reservedFor: [NameType.Parameter] },
-  {
-    name: "delete",
-    reservedFor: [NameType.Parameter, NameType.Operation, ...Newable]
-  },
-  { name: "do", reservedFor: [NameType.Parameter] },
-  { name: "else", reservedFor: [NameType.Parameter] },
-  { name: "enum", reservedFor: [NameType.Parameter] },
-  { name: "error", reservedFor: [NameType.Parameter, ...Newable] },
-  { name: "export", reservedFor: [NameType.Parameter] },
-  { name: "extends", reservedFor: [NameType.Parameter] },
-  { name: "false", reservedFor: [NameType.Parameter] },
-  { name: "finally", reservedFor: [NameType.Parameter] },
-  { name: "for", reservedFor: [NameType.Parameter] },
-  { name: "from", reservedFor: [NameType.Parameter] },
-  { name: "function", reservedFor: [NameType.Parameter, ...Newable] },
-  { name: "get", reservedFor: [NameType.Parameter] },
-  { name: "if", reservedFor: [NameType.Parameter] },
-  { name: "implements", reservedFor: [NameType.Parameter] },
-  { name: "import", reservedFor: [NameType.Parameter] },
-  { name: "in", reservedFor: [NameType.Parameter] },
-  { name: "instanceof", reservedFor: [NameType.Parameter] },
-  { name: "interface", reservedFor: [NameType.Parameter] },
-  { name: "let", reservedFor: [NameType.Parameter] },
-  { name: "module", reservedFor: [NameType.Parameter] },
-  { name: "new", reservedFor: [NameType.Parameter] },
-  { name: "null", reservedFor: [NameType.Parameter] },
-  { name: "number", reservedFor: [NameType.Parameter, ...Newable] },
-  { name: "of", reservedFor: [NameType.Parameter] },
-  { name: "package", reservedFor: [NameType.Parameter] },
-  { name: "private", reservedFor: [NameType.Parameter] },
-  { name: "protected", reservedFor: [NameType.Parameter] },
-  { name: "public", reservedFor: [NameType.Parameter] },
-  { name: "requestoptions", reservedFor: [NameType.Parameter] },
-  { name: "require", reservedFor: [NameType.Parameter] },
-  { name: "return", reservedFor: [NameType.Parameter] },
-  { name: "set", reservedFor: [NameType.Parameter, ...Newable] },
-  { name: "static", reservedFor: [NameType.Parameter] },
-  { name: "string", reservedFor: [NameType.Parameter, ...Newable] },
-  { name: "super", reservedFor: [NameType.Parameter] },
-  { name: "switch", reservedFor: [NameType.Parameter] },
-  { name: "symbol", reservedFor: [NameType.Parameter, ...Newable] },
-  { name: "this", reservedFor: [NameType.Parameter] },
-  { name: "throw", reservedFor: [NameType.Parameter] },
-  { name: "true", reservedFor: [NameType.Parameter] },
-  { name: "try", reservedFor: [NameType.Parameter] },
-  { name: "type", reservedFor: [NameType.Parameter] },
-  { name: "typeof", reservedFor: [NameType.Parameter] },
-  { name: "var", reservedFor: [NameType.Parameter] },
-  { name: "void", reservedFor: [NameType.Parameter] },
-  { name: "while", reservedFor: [NameType.Parameter] },
-  { name: "with", reservedFor: [NameType.Parameter] },
-  { name: "yield", reservedFor: [NameType.Parameter] },
-  { name: "arguments", reservedFor: [NameType.Parameter] }
-];

package/src/transform/transformHelperFunctionDetails.ts

@@ -194,6 +194,7 @@ function extractSpecialSerializeInfo(
   let hasPipeCollection = false;
   let hasTsvCollection = false;
   let hasSsvCollection = false;
+  let hasCsvCollection = false;
   const operationGroups = listOperationGroups(dpgContext, client);
   for (const operationGroup of operationGroups) {
     const operations = listOperationsInOperationGroup(
@@ -216,6 +217,9 @@ function extractSpecialSerializeInfo(
         hasSsvCollection = hasSsvCollection
           ? hasSsvCollection
           : serializeInfo.hasSsvCollection;
+        hasCsvCollection = hasCsvCollection
+          ? hasCsvCollection
+          : serializeInfo.hasCsvCollection;
       });
     }
   }
@@ -236,12 +240,16 @@ function extractSpecialSerializeInfo(
       hasSsvCollection = hasSsvCollection
         ? hasSsvCollection
         : serializeInfo.hasSsvCollection;
+      hasCsvCollection = hasCsvCollection
+        ? hasCsvCollection
+        : serializeInfo.hasCsvCollection;
     });
   }
   return {
     hasMultiCollection,
     hasPipeCollection,
     hasTsvCollection,
-    hasSsvCollection
+    hasSsvCollection,
+    hasCsvCollection
   };
 }

package/src/transform/transformParameters.ts

@@ -126,15 +126,19 @@ function getParameterMetadata(
   paramType: "query" | "path" | "header",
   parameter: HttpOperationParameter
 ): ParameterMetadata {
+  const schemaContext = [SchemaContext.Exception, SchemaContext.Input];
   const schema = getSchemaForType(
     program,
     dpgContext,
     parameter.param.type,
-    [SchemaContext.Exception, SchemaContext.Input],
+    schemaContext,
     false,
     parameter.param
   ) as Schema;
-  let type = getTypeName(schema);
+  let type =
+    paramType === "query"
+      ? getTypeName(schema, schemaContext)
+      : getTypeName(schema);
   const name = getParameterName(parameter.name);
   let description =
     getFormattedPropertyDoc(program, parameter.param, schema) ?? "";
@@ -144,7 +148,8 @@ function getParameterMetadata(
       serializeInfo.hasMultiCollection ||
       serializeInfo.hasPipeCollection ||
       serializeInfo.hasSsvCollection ||
-      serializeInfo.hasTsvCollection
+      serializeInfo.hasTsvCollection ||
+      serializeInfo.hasCsvCollection
     ) {
       type = "string";
       description += ` This parameter needs to be formatted as ${serializeInfo.collectionInfo.join(
@@ -495,6 +500,7 @@ export function getSpecialSerializeInfo(parameter: HttpOperationParameter) {
   let hasPipeCollection = false;
   let hasSsvCollection = false;
   let hasTsvCollection = false;
+  let hasCsvCollection = false;
   const descriptions = [];
   const collectionInfo = [];
   if (
@@ -522,11 +528,18 @@ export function getSpecialSerializeInfo(parameter: HttpOperationParameter) {
     descriptions.push("buildPipeCollection");
     collectionInfo.push("pipe");
   }
+
+  if (parameter.type === "header" && (parameter as any).format === "csv") {
+    hasCsvCollection = true;
+    descriptions.push("buildCsvCollection");
+    collectionInfo.push("csv");
+  }
   return {
     hasMultiCollection,
     hasPipeCollection,
     hasSsvCollection,
     hasTsvCollection,
+    hasCsvCollection,
     descriptions,
     collectionInfo
   };