@azure-tools/typespec-ts 0.54.2 → 0.55.0-dev.10

package/package.json

@@ -1,23 +1,32 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.54.2",
-  "description": "An experimental TypeSpec emitter for TypeScript RLC",
+  "version": "0.55.0-dev.10",
+  "description": "An experimental TypeSpec emitter for TypeScript",
   "main": "dist/src/index.js",
   "type": "module",
   "exports": {
     ".": {
-      "default": "./dist/src/index.js",
-      "types": "./dist/src/index.d.ts"
+      "types": "./dist/src/index.d.ts",
+      "default": "./dist/src/index.js"
     },
     "./testing": {
-      "default": "./dist/src/testing/index.js",
-      "types": "./dist/src/testing/index.d.ts"
+      "types": "./dist/src/testing/index.d.ts",
+      "default": "./dist/src/testing/index.js"
     }
   },
   "author": "Jose Heredia <joheredi@microsoft.com>",
   "license": "MIT",
   "devDependencies": {
     "@azure-rest/core-client": "^2.3.1",
+    "@typespec/http-specs": "^0.1.0-alpha.38 || >=0.1.0-alpha.39-dev <0.1.0-alpha.39",
+    "@typespec/spector": "^0.1.0-alpha.25 || >=0.1.0-alpha.26-dev <0.1.0-alpha.26",
+    "@typespec/spec-api": "^0.1.0-alpha.14 || >=0.1.0-alpha.15-dev <0.1.0-alpha.15",
+    "@typespec/tspd": "^0.75.0 || >=0.76.0-dev <0.76.0",
+    "@azure-tools/azure-http-specs": "^0.1.0-alpha.42 || >=0.1.0-alpha.43-dev <0.1.0-alpha.43",
+    "@azure-tools/typespec-autorest": "^0.69.1 || >=0.70.0-dev <0.70.0",
+    "@azure-tools/typespec-azure-core": "^0.69.0 || >=0.70.0-dev <0.70.0",
+    "@azure-tools/typespec-azure-resource-manager": "^0.69.1 || >=0.70.0-dev <0.70.0",
+    "@azure-tools/typespec-client-generator-core": "^0.69.0 || >=0.70.0-dev <0.70.0",
     "@azure/abort-controller": "^2.1.2",
     "@azure/core-auth": "^1.6.0",
     "@azure/core-lro": "^3.1.0",
@@ -25,7 +34,13 @@
     "@azure/core-rest-pipeline": "^1.14.0",
     "@azure/core-util": "^1.4.0",
     "@azure/logger": "^1.0.4",
-    "@typespec/ts-http-runtime": "0.3.5",
+    "@typespec/compiler": "^1.13.0",
+    "@typespec/http": "^1.13.0",
+    "@typespec/openapi": "^1.13.0",
+    "@typespec/rest": "^0.83.0 || >=0.84.0-dev <0.84.0",
+    "@typespec/versioning": "^0.83.0 || >=0.84.0-dev <0.84.0",
+    "@typespec/xml": "^0.83.0 || >=0.84.0-dev <0.84.0",
+    "@typespec/ts-http-runtime": "0.3.6",
     "cross-env": "^10.1.0",
     "mkdirp": "^3.0.1",
     "npm-run-all": "~4.1.5",
@@ -34,32 +49,16 @@
     "vite": "^8.0.8",
     "@vitest/coverage-v8": "^4.1.3",
     "@microsoft/api-extractor": "^7.58.1",
-    "tsx": "^4.21.0",
-    "yaml": "^2.8.3",
-    "@typespec/tspd": "^0.75.0",
-    "@typespec/spec-api": "^0.1.0-alpha.14",
-    "@typespec/spector": "^0.1.0-alpha.25",
-    "@azure-tools/typespec-autorest": "^0.69.1",
-    "@azure-tools/azure-http-specs": "^0.1.0-alpha.42",
-    "@typespec/http-specs": "^0.1.0-alpha.38",
-    "@azure-tools/typespec-azure-core": "^0.69.0",
-    "@azure-tools/typespec-client-generator-core": "^0.69.0",
-    "@typespec/compiler": "^1.13.0",
-    "@typespec/openapi": "^1.13.0",
-    "@typespec/rest": "^0.83.0",
-    "@typespec/http": "^1.13.0",
-    "@typespec/versioning": "^0.83.0",
-    "@typespec/xml": "^0.83.0",
-    "@azure-tools/typespec-azure-resource-manager": "^0.69.1"
+    "yaml": "^2.8.3"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": "^0.69.0",
+    "@azure-tools/typespec-azure-core": "^0.69.0 || >=0.70.0-dev <0.70.0",
+    "@azure-tools/typespec-client-generator-core": "^0.69.0 || >=0.70.0-dev <0.70.0",
     "@typespec/compiler": "^1.13.0",
-    "@azure-tools/typespec-client-generator-core": "^0.69.0",
-    "@typespec/rest": "^0.83.0",
-    "@typespec/versioning": "^0.83.0",
     "@typespec/http": "^1.13.0",
-    "@typespec/xml": "^0.83.0"
+    "@typespec/rest": "^0.83.0 || >=0.84.0-dev <0.84.0",
+    "@typespec/versioning": "^0.83.0 || >=0.84.0-dev <0.84.0",
+    "@typespec/xml": "^0.83.0 || >=0.84.0-dev <0.84.0"
   },
   "dependencies": {
     "fast-xml-parser": "^5.7.0",
@@ -90,43 +89,29 @@
     "clean": "rimraf ./dist ./typespec-output",
     "build": "tsc -p .",
     "test": "npm run test-next && npm run unit-test && npm run integration-test-ci",
-    "test:azure": "npm run test-next && npm run copy:typespec && npm run integration-test-ci:azure-rlc && npm run integration-test-ci:azure-modular",
-    "test:standard": "npm run test-next && npm run copy:typespec && npm run unit-test&& npm run integration-test-ci:rlc && npm run integration-test-ci:modular",
+    "test:azure": "npm run test-next && npm run copy:typespec && npm run integration-test-ci:azure-modular",
     "lint": "eslint . --ext .ts --max-warnings=0",
     "lint:fix": "eslint . --fix --ext .ts",
-    "check:tree": "tsx ./test/commands/check-clean-tree.ts",
-    "test:ts:e2e": "npm run copy:typespec && npm run integration-test-ci:azure-rlc && npm run integration-test-ci:azure-modular",
-    "integration-test-ci": "npm-run-all copy:typespec integration-test-ci:rlc integration-test-ci:azure-rlc integration-test-ci:modular integration-test-ci:azure-modular",
-    "integration-test-ci:sequential": "npm-run-all --serial copy:typespec integration-test-ci:modular && npm run integration-test-ci:modular",
-    "integration-test-ci:rlc": "npm-run-all --silent -p start-test-server:rlc --race generate-and-run:rlc",
-    "integration-test-ci:azure-rlc": "npm-run-all --silent -p start-test-server:azure-rlc --race generate-and-run:azure-rlc",
-    "integration-test-ci:modular": "npm-run-all --silent -p start-test-server:modular --race generate-and-run:modular",
+    "check:tree": "node ./test/commands/check-clean-tree.ts",
+    "test:ts:e2e": "npm run copy:typespec && npm run integration-test-ci:azure-modular",
+    "integration-test-ci": "npm-run-all copy:typespec integration-test-ci:azure-modular",
+    "integration-test-ci:sequential": "npm-run-all --serial copy:typespec integration-test-ci:azure-modular",
     "integration-test-ci:azure-modular": "npm-run-all --silent -p start-test-server:azure-modular --race generate-and-run:azure-modular",
     "start-test-server": "mkdirp -p coverage && npx tsp-spector serve ./node_modules/@typespec/http-specs/specs  --coverageFile ./coverage/spector-coverage-typescript.json",
-    "start-test-server:rlc": "mkdirp -p coverage && npx tsp-spector serve ./node_modules/@typespec/http-specs/specs --coverageFile ./coverage/spector-coverage-typescript-rlc-standard.json",
-    "start-test-server:azure-rlc": "mkdirp -p coverage && npx tsp-spector serve ./node_modules/@azure-tools/azure-http-specs/specs ./node_modules/@typespec/http-specs/specs --coverageFile ./coverage/spector-coverage-typescript-rlc-azure.json",
-    "start-test-server:modular": "mkdirp -p coverage && npx tsp-spector serve ./node_modules/@typespec/http-specs/specs --port 3002  --coverageFile ./coverage/spector-coverage-typescript-modular-standard.json",
     "start-test-server:azure-modular": "mkdirp -p coverage && npx tsp-spector serve ./node_modules/@azure-tools/azure-http-specs/specs ./node_modules/@typespec/http-specs/specs --port 3002  --coverageFile ./coverage/spector-coverage-typescript-modular-azure.json",
-    "copy:typespec": "rm -rf temp && mkdirp -p temp/specs && mkdirp -p temp/assets && cp -r ./node_modules/@typespec/http-specs/specs/* ./temp/specs && cp -r ./node_modules/@azure-tools/azure-http-specs/specs/* ./temp/specs && cp -r ./test/integration/typespec/* ./temp/specs && cp -r ./node_modules/@typespec/http-specs/assets/* ./temp/assets",
-    "generate-and-run:rlc": "npm run generate-tsp-only:rlc && npm run integration-test:alone:rlc && npm run stop-test-server -- -p 3000",
-    "generate-and-run:azure-rlc": "npm run generate-tsp-only:azure-rlc && npm run integration-test:alone:azure-rlc && npm run stop-test-server -- -p 3000",
-    "generate-and-run:modular": "npm run generate-tsp-only:modular && npm run integration-test:alone:modular && npm run stop-test-server -- -p 3002",
-    "generate-and-run:azure-modular": "npm run generate-tsp-only:azure-modular && npm run integration-test:alone:azure-modular && npm run stop-test-server -- -p 3002",
-    "generate-tsp-only": "npm run generate-tsp-only:azure-rlc && npm run generate-tsp-only:rlc &&npm run generate-tsp-only:azure-modular && npm run generate-tsp-only:modular",
-    "generate-tsp-only:rlc": "npx tsx ./test/commands/gen-spector.js --tag=rlc",
-    "generate-tsp-only:azure-rlc": "npx tsx ./test/commands/gen-spector.js --tag=azure-rlc",
-    "generate-tsp-only:modular": "npx tsx ./test/commands/gen-spector.js --tag=modular",
-    "generate-tsp-only:azure-modular": "npx tsx ./test/commands/gen-spector.js --tag=azure-modular",
+    "copy:typespec": "node ./test/commands/copy-typespec.ts",
+    "generate-and-run:azure-modular": "npm run generate-tsp-only:azure-modular:client && npm-run-all -p integration-test:alone:azure-modular generate-tsp-only:azure-modular:declarations && npm run stop-test-server -- -p 3002",
+    "generate-tsp-only": "npm run generate-tsp-only:azure-modular",
+    "generate-tsp-only:azure-modular": "node ./test/commands/gen-spector.js",
+    "generate-tsp-only:azure-modular:client": "node ./test/commands/gen-spector.js --phase=client",
+    "generate-tsp-only:azure-modular:declarations": "node ./test/commands/gen-spector.js --phase=declarations",
     "regen-test-baselines": "npm run generate-tsp-only",
-    "integration-test:alone": "npm run integration-test:alone:rlc && npm run integration-test:alone:azure-rlc && npm run integration-test:alone:modular && npm run integration-test:alone:azure-modular",
-    "integration-test:alone:rlc": "vitest run --project integration-rlc",
-    "integration-test:alone:azure-rlc": "vitest run --project integration-azure-rlc",
-    "integration-test:alone:modular": "vitest run --project integration-modular",
+    "integration-test:alone": "npm run integration-test:alone:azure-modular",
     "integration-test:alone:azure-modular": "vitest run --project integration-azure-modular",
     "stop-test-server": "npx tsp-spector server stop",
-    "unit-test": "npm-run-all --parallel unit-test:rlc unit-test:modular",
-    "unit-test:rlc": "vitest run --project unit-rlc",
-    "unit-test:modular": "cross-env NODE_OPTIONS=--max-old-space-size=8192 vitest run --project unit-modular",
-    "regen-docs": "npm run build && tspd doc . --enable-experimental --output-dir ./website/src/content/docs/docs/emitters/clients/typespec-ts/reference --skip-js"
+    "unit-test": "npm run unit-test:modular",
+    "unit-test:modular": "cross-env NODE_OPTIONS=--max-old-space-size=1024 vitest run --project unit-modular",
+    "gen:scenario-suites": "node ./test/commands/gen-scenario-suites.ts",
+    "regen-docs": "npm run build && tspd doc . --enable-experimental --output-dir ../../website/src/content/docs/docs/emitters/clients/typespec-ts/reference --skip-js"
   }
 }

package/src/framework/hooks/binder.ts

@@ -1,5 +1,4 @@
-import { normalizePath } from "@typespec/compiler";
-import path from "path/posix";
+import { joinPaths, normalizePath } from "@typespec/compiler";
 import {
   ImportDeclarationStructure,
   ImportSpecifierStructure,
@@ -24,7 +23,7 @@ export interface BinderOptions {
   staticHelpers?: Map<string, StaticHelperMetadata>;
   dependencies?: Record<string, ReferenceableSymbol>;
   /** When true, use #platform/ subpath imports for static helpers with platform variants.
-   *  Should be true for warp (azureSdkForJs) packages; false for tshy packages. */
+   *  Should be true for warp packages; false for tshy packages. */
   useSubpathImports?: boolean;
 }
 
@@ -354,7 +353,7 @@ class BinderImp implements Binder {
 
     // Also keep files that are imported by any used helper file
     const helperFiles = this.project.getSourceFiles(
-      normalizePath(path.join(sourceRoot, "static-helpers/**/*.*ts")),
+      normalizePath(joinPaths(sourceRoot, "static-helpers/**/*.*ts")),
     );
     const usedFiles = helperFiles.filter((file) => !isFileUnused(file, usedHelperNames));
     for (const usedFile of usedFiles) {
@@ -378,7 +377,7 @@ class BinderImp implements Binder {
     }
     this.project
       //normalizae the final path to adapt to different systems
-      .getSourceFiles(normalizePath(path.join(testRoot, "test/generated/util/**/*.*ts")))
+      .getSourceFiles(normalizePath(joinPaths(testRoot, "test/generated/util/**/*.*ts")))
       .filter((file) => isFileUnused(file, usedHelperNames))
       .forEach((helperFile) => helperFile.delete());
   }

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

@@ -23,11 +23,10 @@ export const flattenPropertyModelMap: Map<SdkModelPropertyType, SdkModelType> =
   SdkModelType
 >();
 /**
- * Set of paged result models that should keep their public name (no "_" prefix).
- * This includes models used as non-paging method responses or as model properties.
+ * Set of paged result models that are also used in non-paging operations.
  * Precomputed during visitPackageTypes for O(1) lookups in normalizeModelName.
  */
-export const pagedModelsKeptPublic = new Set<SdkType>();
+export const pagedModelsUsedInNonPagingOps = new Set<SdkType>();
 
 export interface SdkTypeContext {
   operations: Map<Type, SdkServiceMethod<SdkHttpOperation>>;

package/src/framework/load-static-helpers.ts

@@ -1,6 +1,4 @@
-import { NoTarget, Program } from "@typespec/compiler";
-import { readdir, readFile, stat } from "fs/promises";
-import * as path from "path";
+import { type CompilerHost, joinPaths, NoTarget, Program } from "@typespec/compiler";
 import {
   ClassDeclaration,
   EnumDeclaration,
@@ -12,7 +10,6 @@ import {
 } from "ts-morph";
 import { reportDiagnostic } from "../lib.js";
 import { ModularEmitterOptions } from "../modular/interfaces.js";
-import { isAzurePackage } from "../rlc-common/index.js";
 import { resolveProjectRoot } from "../utils/resolve-project-root.js";
 import { refkey } from "./refkey.js";
 export const SourceFileSymbol = Symbol("SourceFile");
@@ -39,6 +36,9 @@ export interface LoadStaticHelpersOptions extends Partial<ModularEmitterOptions>
   sourcesDir?: string;
   rootDir?: string;
   program?: Program;
+  host?: CompilerHost;
+  /** The emitter package root directory (where static/ lives). */
+  packageRoot?: string;
   /** When true, also load test helpers from static/test-helpers/ into test/generated/util/ */
   loadTestHelpers?: boolean;
 }
@@ -54,27 +54,29 @@ export async function loadStaticHelpers(
   options: LoadStaticHelpersOptions = {},
 ): Promise<Map<string, StaticHelperMetadata>> {
   const helpersMap = new Map<string, StaticHelperMetadata>();
+  const host = options.host ?? options.program?.host;
+  if (!host) {
+    throw new Error(
+      "loadStaticHelpers requires either a host or program in options to access the file system.",
+    );
+  }
+
+  const packageRoot = options.packageRoot ?? resolveProjectRoot();
+
   // Load static helpers used in sources code
-  const defaultStaticHelpersPath = path.join(
-    resolveProjectRoot(),
-    DEFAULT_SOURCES_STATIC_HELPERS_PATH,
-  );
+  const defaultStaticHelpersPath = joinPaths(packageRoot, DEFAULT_SOURCES_STATIC_HELPERS_PATH);
   const filesInSources = await traverseDirectory(
     options.helpersAssetDirectory ?? defaultStaticHelpersPath,
+    host,
     options.program,
   );
   await loadFiles(filesInSources, options.sourcesDir ?? "");
   // Load static helpers used in testing code (only when loadTestHelpers is enabled)
-  if (
-    options.loadTestHelpers ??
-    (options.options?.generateTest && isAzurePackage({ options: options.options }))
-  ) {
-    const defaultTestingHelpersPath = path.join(
-      resolveProjectRoot(),
-      DEFAULT_SOURCES_TESTING_HELPERS_PATH,
-    );
+  if (options.loadTestHelpers ?? options.options?.generateTest) {
+    const defaultTestingHelpersPath = joinPaths(packageRoot, DEFAULT_SOURCES_TESTING_HELPERS_PATH);
     const filesInTestings = await traverseDirectory(
       defaultTestingHelpersPath,
+      host,
       options.program,
       [],
       "",
@@ -86,34 +88,25 @@ export async function loadStaticHelpers(
 
   async function loadFiles(files: FileMetadata[], generateDir: string) {
     for (const file of files) {
-      const targetPath = path.join(generateDir, file.target);
-      const contents = await readFile(file.source, "utf-8");
+      const targetPath = joinPaths(generateDir, file.target);
+      const sourceFile = await host!.readFile(file.source);
+      const contents = sourceFile.text;
       const addedFile = project.createSourceFile(targetPath, contents, {
         overwrite: true,
       });
       addedFile.getImportDeclarations().map((i) => {
-        if (!isAzurePackage({ options: options.options })) {
-          if (i.getModuleSpecifier().getFullText().includes("@azure/core-rest-pipeline")) {
-            i.setModuleSpecifier("@typespec/ts-http-runtime");
-          }
-          if (i.getModuleSpecifier().getFullText().includes("@azure-rest/core-client")) {
-            i.setModuleSpecifier("@typespec/ts-http-runtime");
-          }
-        }
         // Rewrite relative platform-types imports to #platform/ specifiers
         // so that browser/react-native variants are resolved via subpath imports.
         // Only rewrite imports to the default variant (not -browser/-react-native variants
         // which are already platform-specific direct imports).
-        if (options.options?.azureSdkForJs) {
-          const specifier = i.getModuleSpecifierValue();
-          if (
-            specifier.startsWith(".") &&
-            specifier.includes("platform-types") &&
-            !specifier.includes("-browser") &&
-            !specifier.includes("-react-native")
-          ) {
-            i.setModuleSpecifier("#platform/static-helpers/platform-types");
-          }
+        const specifier = i.getModuleSpecifierValue();
+        if (
+          specifier.startsWith(".") &&
+          specifier.includes("platform-types") &&
+          !specifier.includes("-browser") &&
+          !specifier.includes("-react-native")
+        ) {
+          i.setModuleSpecifier("#platform/static-helpers/platform-types");
         }
       });
 
@@ -187,32 +180,36 @@ function getDeclarationByMetadata(
   }
 }
 
+type FsHost = Pick<CompilerHost, "readFile" | "readDir" | "stat">;
+
 const _targetStaticHelpersBaseDir = "static-helpers";
 async function traverseDirectory(
   directory: string,
+  host: FsHost,
   program?: Program,
   result: { source: string; target: string }[] = [],
   relativePath: string = "",
   targetBaseDir: string = _targetStaticHelpersBaseDir,
 ): Promise<{ source: string; target: string }[]> {
   try {
-    const files = await readdir(directory);
+    const files = await host.readDir(directory);
 
     await Promise.all(
       files.map(async (file) => {
-        const filePath = path.join(directory, file);
-        const fileStat = await stat(filePath);
+        const filePath = joinPaths(directory, file);
+        const fileStat = await host.stat(filePath);
 
         if (fileStat.isDirectory()) {
           await traverseDirectory(
             filePath,
+            host,
             program,
             result,
-            path.join(relativePath, file),
+            joinPaths(relativePath, file),
             targetBaseDir,
           );
         } else if (fileStat.isFile() && !file.endsWith(".d.ts") && /.*\..?ts$/.test(file)) {
-          const target = path.join(targetBaseDir, relativePath, file);
+          const target = joinPaths(targetBaseDir, relativePath, file);
           result.push({ source: filePath, target });
         }
       }),

package/src/framework/sample.ts

@@ -9,7 +9,7 @@ import { useBinder } from "./hooks/binder.js";
 import { resolveReference } from "./reference.js";
 
 // Create a new ts-morph project
-const project = new Project();
+const project = new Project({ useInMemoryFileSystem: true });
 
 // Create a source file
 const sourceFile = project.createSourceFile("test.ts", "", { overwrite: true });