@azure-tools/typespec-ts 0.46.0 → 0.46.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.46.0",
+  "version": "0.46.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.28-dev.1",
-    "@typespec/spector": "0.1.0-alpha.20-dev.0",
-    "@typespec/spec-api": "0.1.0-alpha.10-dev.0",
-    "@typespec/tspd": "0.73.0",
-    "@azure-tools/azure-http-specs": "0.1.0-alpha.32-dev.2",
-    "@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",
+    "@typespec/http-specs": "0.1.0-alpha.29-dev.2",
+    "@typespec/spector": "0.1.0-alpha.21-dev.1",
+    "@typespec/spec-api": "0.1.0-alpha.11-dev.0",
+    "@typespec/tspd": "0.73.1",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.33-dev.0",
+    "@azure-tools/typespec-autorest": "^0.62.0",
+    "@azure-tools/typespec-azure-core": "^0.62.0",
+    "@azure-tools/typespec-azure-resource-manager": "^0.62.0",
+    "@azure-tools/typespec-client-generator-core": "^0.62.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.5.0",
-    "@typespec/http": "^1.5.0",
-    "@typespec/openapi": "^1.5.0",
-    "@typespec/rest": "^0.75.0",
+    "@typespec/compiler": "^1.6.0",
+    "@typespec/http": "^1.6.0",
+    "@typespec/openapi": "^1.6.0",
+    "@typespec/rest": "^0.76.0",
     "@typespec/ts-http-runtime": "^0.1.0",
-    "@typespec/versioning": "^0.75.0",
+    "@typespec/versioning": "^0.76.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.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"
+    "@azure-tools/typespec-azure-core": "^0.62.0",
+    "@azure-tools/typespec-client-generator-core": "^0.62.0",
+    "@typespec/compiler": "^1.6.0",
+    "@typespec/http": "^1.6.0",
+    "@typespec/rest": "^0.76.0",
+    "@typespec/versioning": "^0.76.0",
+    "@typespec/xml": "^0.76.0"
   },
   "dependencies": {
-    "@azure-tools/rlc-common": "^0.46.0",
+    "@azure-tools/rlc-common": "^0.46.1",
     "fs-extra": "^11.1.0",
     "lodash": "^4.17.21",
     "prettier": "^3.3.3",

package/src/index.ts

@@ -35,6 +35,7 @@ import {
   buildPollingHelper,
   buildPaginateHelper as buildRLCPaginateHelper,
   buildReadmeFile,
+  updateReadmeFile,
   buildRecordedClientFile,
   buildResponseTypes,
   buildRollupConfig,
@@ -162,6 +163,8 @@ export async function $onEmit(context: EmitContext) {
   // 2. Generate RLC code model
   // TODO: skip this step in modular once modular generator is sufficiently decoupled
   await buildRLCCodeModels();
+  // 3. Clear samples-dev folder if generateSample is true
+  await clearSamplesDevFolder();
 
   // 4. Generate sources
   if (emitterOptions["is-modular-library"]) {
@@ -236,6 +239,18 @@ export async function $onEmit(context: EmitContext) {
     );
   }
 
+  async function clearSamplesDevFolder() {
+    if (emitterOptions["generate-sample"] === true) {
+      const samplesDevPath = join(
+        dpgContext.generationPathDetail?.rootDir ?? "",
+        "samples-dev"
+      );
+      if (await fsextra.pathExists(samplesDevPath)) {
+        await fsextra.emptyDir(samplesDevPath);
+      }
+    }
+  }
+
   async function buildRLCCodeModels() {
     const clients = getRLCClients(dpgContext);
     for (const client of clients) {
@@ -408,6 +423,11 @@ export async function $onEmit(context: EmitContext) {
       "package.json"
     );
     const hasPackageFile = await existsSync(existingPackageFilePath);
+    const existingReadmeFilePath = join(
+      dpgContext.generationPathDetail?.metadataDir ?? "",
+      "README.md"
+    );
+    const hasReadmeFile = await existsSync(existingReadmeFilePath);
     const shouldGenerateMetadata =
       option.generateMetadata === true || !hasPackageFile;
     const existingTestFolderPath = join(
@@ -507,12 +527,29 @@ export async function $onEmit(context: EmitContext) {
       }
     } else if (hasPackageFile) {
       // update existing package.json file with correct dependencies
+      let modularPackageInfo = {};
+      if (option.isModularLibrary) {
+        modularPackageInfo = {
+          exports: getModuleExports(context, modularEmitterOptions)
+        };
+      }
       await emitContentByBuilder(
         program,
-        (model) => updatePackageFile(model, existingPackageFilePath),
+        (model) =>
+          updatePackageFile(model, existingPackageFilePath, modularPackageInfo),
         rlcClient,
         dpgContext.generationPathDetail?.metadataDir
       );
+
+      // update existing README.md file if it exists
+      if (hasReadmeFile) {
+        await emitContentByBuilder(
+          program,
+          (model) => updateReadmeFile(model, existingReadmeFilePath),
+          rlcClient,
+          dpgContext.generationPathDetail?.metadataDir
+        );
+      }
     }
     if (isAzureFlavor) {
       await emitContentByBuilder(

package/src/lib.ts

@@ -102,7 +102,8 @@ export const RLCOptionsSchema: JSONSchemaType<EmitterOptions> = {
         scopeName: { type: "string", nullable: true },
         nameWithoutScope: { type: "string", nullable: true },
         description: { type: "string", nullable: true },
-        version: { type: "string", nullable: true }
+        version: { type: "string", nullable: true },
+        isVersionUserProvided: { type: "boolean", nullable: true }
       },
       required: ["name"],
       nullable: true,

package/src/modular/emitModels.ts

@@ -112,13 +112,12 @@ export function emitTypes(
     sourceFile = outputProject.getSourceFile(filepath);
     if (!sourceFile) {
       sourceFile = outputProject.createSourceFile(filepath);
-      sourceFile.addStatements(
-        `/**
-* This file contains only generated model types and (de)serializers.
-* Disable this rule for deserializer functions which require 'any' for raw JSON input.
+      sourceFile.addStatements(`/**
+* This file contains only generated model types and their (de)serializers.
+* Disable the following rules for internal models with '_' prefix and deserializers which require 'any' for raw JSON input.
 */
-/* eslint-disable @typescript-eslint/explicit-module-boundary-types */`
-      );
+/* eslint-disable @typescript-eslint/naming-convention */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */`);
     }
     emitType(context, type, sourceFile);
   }

package/src/modular/helpers/operationHelpers.ts

@@ -637,19 +637,25 @@ function getPagingOnlyOperationFunction(
       return property.name;
     })
     .join(".");
+
+  // Check for nextLinkVerb from TCGC pagingMetadata (supports @Legacy.nextLinkVerb decorator)
+  const nextLinkMethod = operation.pagingMetadata.nextLinkVerb;
+
   if (itemName) {
     options.push(`itemName: "${itemName}"`);
   }
   if (nextLinkName) {
     options.push(`nextLinkName: "${nextLinkName}"`);
   }
+  if (nextLinkMethod && nextLinkMethod !== "GET") {
+    options.push(`nextLinkMethod: "${nextLinkMethod}"`);
+  }
   statements.push(
     `return ${buildPagedAsyncIteratorReference}(
       context, 
       () => _${name}Send(${parameters.map((p) => p.name).join(", ")}), 
       _${name}Deserialize,
-      ${getExpectedStatuses(operation)},
-      ${options.length > 0 ? `{${options.join(", ")}}` : ``}
+      ${getExpectedStatuses(operation)}${options.length > 0 ? `,\n      {${options.join(", ")}}` : ""}
       );`
   );
 

package/src/transform/transfromRLCOptions.ts

@@ -5,8 +5,7 @@ import {
   PackageDetails,
   PackageFlavor,
   RLCOptions,
-  ServiceInfo,
-  isAzurePackage
+  ServiceInfo
 } from "@azure-tools/rlc-common";
 import { getHttpOperationWithCache } from "@azure-tools/typespec-client-generator-core";
 import { getDoc, NoTarget, Program } from "@typespec/compiler";
@@ -34,13 +33,7 @@ export function transformRLCOptions(
     emitterOptions,
     dpgContext.generationPathDetail?.rootDir ?? ""
   );
-  if (
-    !isAzurePackage({ options }) &&
-    emitterOptions["is-modular-library"] !== false
-  ) {
-    options.isModularLibrary = true;
-  }
-  if (dpgContext.arm && emitterOptions["is-modular-library"] !== false) {
+  if (emitterOptions["is-modular-library"] !== false) {
     options.isModularLibrary = true;
   }
   const batch = getRLCClients(dpgContext);
@@ -302,6 +295,9 @@ function buildPackageDetails(
     nameWithoutScope: "unamedpackage",
     version: "1.0.0-beta.1"
   };
+  const isVersionUserProvided = Boolean(
+    emitterOptions["package-details"]?.version
+  );
   const packageDetails: PackageDetails = {
     ...emitterOptions["package-details"],
     name:
@@ -310,7 +306,8 @@ function buildPackageDetails(
         emitterOptions?.title ?? getDefaultService(program)?.title ?? "",
         NameType.Class
       ),
-    version: emitterOptions["package-details"]?.version ?? "1.0.0-beta.1"
+    version: emitterOptions["package-details"]?.version ?? "1.0.0-beta.1",
+    isVersionUserProvided
   };
   if (emitterOptions["package-details"]?.name) {
     const nameParts = emitterOptions["package-details"]?.name.split("/");

package/static/static-helpers/pagingHelpers.ts

@@ -90,6 +90,7 @@ export interface PagedResult<
 export interface BuildPagedAsyncIteratorOptions {
   itemName?: string;
   nextLinkName?: string;
+  nextLinkMethod?: "GET" | "POST";
 }
 
 /**
@@ -109,12 +110,15 @@ export function buildPagedAsyncIterator<
 ): PagedAsyncIterableIterator<TElement, TPage, TPageSettings> {
   const itemName = options.itemName ?? "value";
   const nextLinkName = options.nextLinkName ?? "nextLink";
+  const nextLinkMethod = options.nextLinkMethod ?? "GET";
   const pagedResult: PagedResult<TElement, TPage, TPageSettings> = {
     getPage: async (pageLink?: string) => {
       const result =
         pageLink === undefined
           ? await getInitialResponse()
-          : await client.pathUnchecked(pageLink).get();
+          : nextLinkMethod === "POST"
+            ? await client.pathUnchecked(pageLink).post()
+            : await client.pathUnchecked(pageLink).get();
       checkPagingRequest(result, expectedStatuses);
       const results = await processResponseBody(result as TResponse);
       const nextLink = getNextLink(results, nextLinkName);

package/static/static-helpers/urlTemplate.ts

@@ -177,7 +177,7 @@ export function expandUrlTemplate(
   context: Record<string, any>,
   option?: UrlTemplateOptions
 ): string {
-  return template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
+  const result = template.replace(/\{([^{}]+)\}|([^{}]+)/g, (_, expr, text) => {
     if (!expr) {
       return encodeReservedComponent(text);
     }
@@ -207,4 +207,21 @@ export function expandUrlTemplate(
     }
     return result.join("");
   });
+
+  return normalizeUnreserved(result);
+}
+
+/**
+ * Normalize an expanded URI by decoding percent-encoded unreserved characters.
+ * RFC 3986 unreserved: "-" / "." / "~"
+ */
+function normalizeUnreserved(uri: string): string {
+  return uri.replace(/%([0-9A-Fa-f]{2})/g, (match, hex) => {
+    const char = String.fromCharCode(parseInt(hex, 16));
+    // Decode only if it's unreserved
+    if (/[\-.~]/.test(char)) {
+      return char;
+    }
+    return match; // leave other encodings intact
+  });
 }