@autorest/typescript 6.0.0-beta.7 → 6.0.0-rc.1

package/package.json

@@ -1,29 +1,48 @@
 {
     "name": "@autorest/typescript",
-    "version": "6.0.0-beta.7",
+    "version": "6.0.0-rc.1",
     "scripts": {
         "build": "tsc -p . && npm run copyFiles",
         "build:test:browser": "tsc -p tsconfig.browser-test.json && webpack --config webpack.config.test.js",
-        "check:tree": "ts-node ./test/utils/check-clean-tree.ts",
+        "check:tree": "ts-node ./test/commands/check-clean-tree.ts",
         "clean": "rimraf test-browser test/**/node_modules",
         "start": "node ./dist/src/main.js",
-        "test": "npm-run-all unit-test integration-test",
-        "test:node": "npm run unit-test && npm run start-test-server:v2 & npm run integration-test:alone && npm run stop-test-server",
-        "test:browser": "npm run start-test-server:v2 & npm run integration-test:browser && npm run stop-test-server",
+        "test": "npm-run-all unit-test integration-test rlc-integration-test validate-version-tolerance",
+        "test:node": "npm run unit-test && npm run start-test-server:v2 & npm run integration-test:alone & npm run rlc-integration-test:alone & npm run test-version-tolerance & npm run stop-test-server",
+        "test:node:alone": "npm run unit-test && npm run integration-test:alone && npm run rlc-integration-test:alone && npm run test-version-tolerance",
+        "test:browser": "npm run start-test-server:v2 & npm run integration-test:browser & npm run rlc-integration-test:browser & npm run test-version-tolerance & npm run stop-test-server",
+        "test:browser:alone": "npm run integration-test:browser && npm run rlc-integration-test:browser && npm run test-version-tolerance",
+        "rlc-test:node": "npm run unit-test && npm run start-test-server:v2 & npm run rlc-integration-test:alone && npm run stop-test-server",
+        "rlc-test:browser": "npm run start-test-server:v2 & npm run rlc-integration-test:browser && npm run stop-test-server",
         "unit-test": "mocha -r ts-node/register './test/unit/**/*spec.ts'",
         "integration-test": "npm run start-test-server:v2 & npm run generate-and-test && npm run stop-test-server",
         "integration-test:new": "npm-run-all start-test-server generate-and-test integration-test:alone stop-test-server",
         "integration-test:browser": "npm run build:test:browser && karma start karma.conf.js",
         "generate-and-test": "npm-run-all -s build generate-swaggers integration-test:alone integration-test:browser",
-        "integration-test:alone": "mocha -r ts-node/register --timeout 2000 './test/integration/**/*spec.ts'",
-        "start-test-server": "ts-node test/utils/start-server.ts",
-        "start-test-server:v2": "autorest-testserver",
+        "integration-test:alone": "mocha -r ts-node/register --timeout 2000 './test/integration/**/!(sampleTest).spec.ts'",
+        "rlc-integration-test": "npm run start-test-server:v2 & npm run rlc-generate-and-test && npm run stop-test-server",
+        "rlc-integration-test:new": "npm-run-all start-test-server rlc-generate-and-test rlc-integration-test:alone stop-test-server",
+        "rlc-integration-test:browser": "npm run build:test:browser && karma start karma.conf.js",
+        "rlc-generate-and-test": "npm-run-all -s build rlc-generate-swaggers rlc-integration-test:alone rlc-integration-test:browser",
+        "rlc-integration-test:alone": "mocha -r ts-node/register --timeout 2000 './test/rlcIntegration/**/!(sampleTest).spec.ts'",
+        "start-test-server": "ts-node test/commands/start-server.ts",
+        "start-test-server:v2": "autorest-testserver run --appendCoverage",
         "stop-test-server": "autorest-testserver stop",
         "debug": "node --inspect-brk ./dist/src/main.js",
-        "generate-swaggers": "ts-node ./test/utils/test-swagger-gen.ts",
+        "generate-swaggers": "ts-node ./test/commands/test-swagger-gen.ts",
+        "rlc-generate-swaggers": "ts-node ./test/commands/test-swagger-gen.ts -- rlc",
+        "validate-version-tolerance": "npm run start-test-server:v2 & npm run generate-version-tolerance && npm run generate-version-tolerance:tests && npm run test-version-tolerance && npm run stop-test-server",
+        "generate-version-tolerance": "ts-node ./test/commands/version-tolerance.ts",
+        "generate-version-tolerance:tests": "ts-node ./test/commands/version-tolerance.ts --test-gen",
+        "test-version-tolerance": "mocha -r ts-node/register --timeout 2000 './test/version-tolerance/**/!(sampleTest).spec.ts'",
         "clone:specs": "git clone https://github.com/Azure/azure-rest-api-specs.git ./.tmp/specs",
-        "smoke-test": "ts-node ./test/utils/smoke-test.ts",
-        "copyFiles": "cp src/generators/static/README.md.hbs dist/src/generators/static/README.md.hbs"
+        "smoke-test": "ts-node ./test/commands/smoke-test.ts",
+        "copyFiles": "ts-node ./src/utils/copyFiles.ts"
+    },
+    "browser": {
+        "./test-browser/utils/stream-helpers.js": "./test-browser/utils/stream-helpers.browser.js",
+        "./test-browser/utils/fileSystem.js": "./test-browser/utils/fileSystem.browser.js",
+        "./test-browser/utils/path.js": "./test-browser/utils/path.browser.js"
     },
     "files": [
         "src",
@@ -32,69 +51,70 @@
         "LICENSE"
     ],
     "dependencies": {
-        "@autorest/codemodel": "^4.15.0",
-        "@autorest/extension-base": "^3.2.1",
-        "@azure-rest/core-client": "^1.0.0-beta.4",
+        "@autorest/codemodel": "^4.18.2",
+        "@autorest/extension-base": "^3.4.1",
+        "@autorest/testmodeler": "^2.2.5",
+        "@azure-rest/core-client": "dev",
         "@azure-tools/codegen": "^2.5.294",
-        "@azure/core-client": "^1.1.2",
+        "@azure/core-client": "^1.5.0",
         "@azure/core-http": "^1.2.4",
-        "@azure/core-lro": "^1.0.5",
-        "@azure/core-paging": "^1.1.3",
-        "@azure/core-rest-pipeline": "^1.0.4",
-        "@azure/core-tracing": "^1.0.0-preview.11",
+        "@azure/core-http-compat": "^1.2.0",
+        "@azure/core-lro": "^2.1.0",
+        "@azure/core-paging": "^1.2.0",
+        "@azure/core-rest-pipeline": "^1.8.0",
+        "@azure/core-tracing": "^1.0.0",
         "@azure/logger": "^1.0.0",
-        "@opentelemetry/api": "^0.10.2",
         "@types/lodash": "^4.14.149",
+        "fs-extra": "^10.0.0",
         "handlebars": "^4.7.7",
         "lodash": "^4.17.21",
         "prettier": "^1.19.1",
         "source-map-support": "^0.5.16",
-        "ts-morph": "^9.0.0"
+        "ts-morph": "^9.0.0",
+        "dotenv": "^8.2.0"
     },
     "devDependencies": {
-        "@autorest/test-server": "^3.0.27",
+        "@azure-tools/test-recorder": "^1.0.0",
         "@azure/abort-controller": "^1.0.1",
         "@azure/core-util": "^1.0.0-beta.1",
         "@azure/core-xml": "^1.0.0-beta.1",
-        "@microsoft.azure/autorest.testserver": "^3.0.21",
+        "@microsoft.azure/autorest.testserver": "^3.3.28",
         "@types/chai": "^4.2.8",
+        "@types/fs-extra": "^8.1.0",
         "@types/js-yaml": "3.12.1",
         "@types/mocha": "^5.2.7",
         "@types/node": "^12.7.12",
         "@types/prettier": "^1.18.4",
         "@types/sinon": "^10.0.0",
-        "@types/tough-cookie": "^4.0.0",
         "@types/xmlbuilder": "0.0.34",
-        "@types/yargs": "^15.0.4",
-        "@typescript-eslint/eslint-plugin": "~2.0.0",
-        "@typescript-eslint/parser": "~2.0.0",
-        "autorest": "^3.1.1",
+        "@types/yargs": "^17.0.10",
+        "@typescript-eslint/eslint-plugin": "^5.25.0",
+        "@typescript-eslint/parser": "^5.25.0",
+        "autorest": "^3.4.2",
         "chai": "^4.2.0",
         "chalk": "^4.0.0",
         "directory-tree": "^2.2.7",
-        "eslint": "~6.2.2",
-        "karma": "^5.0.9",
+        "eslint": "^8.15.0",
+        "karma": "^6.3.18",
         "karma-chrome-launcher": "^3.1.0",
         "karma-mocha": "^2.0.1",
-        "karma-mocha-reporter": "^2.2.5",
         "karma-source-map-support": "^1.4.0",
         "karma-typescript": "^5.0.3",
         "karma-typescript-es6-transform": "^5.0.3",
-        "mocha": "^6.2.1",
-        "mocha-typescript": "1.1.17",
-        "moment": "^2.24.0",
+        "mocha": "^9.2.2",
+        "moment": "^2.29.2",
         "node-cmd": "^3.0.0",
         "npm-run-all": "^4.1.5",
+        "path-browserify": "^1.0.1",
         "puppeteer": "^3.3.0",
         "rimraf": "^3.0.2",
         "sinon": "^10.0.0",
         "source-map-loader": "^1.0.0",
-        "tough-cookie": "^4.0.0",
         "ts-node": "^8.5.2",
         "typescript": "^4.3.4",
         "wait-port": "^0.2.6",
-        "webpack": "^4.43.0",
-        "webpack-cli": "^3.3.12",
-        "yargs": "^15.3.1"
+        "webpack": "^5.72.0",
+        "webpack-cli": "^4.9.2",
+        "yargs": "^17.4.1"
     }
-}
+}

package/src/autorestSession.ts

@@ -1,15 +1,21 @@
-import { Host, Session, startSession } from "@autorest/extension-base";
+import {
+  AutorestExtensionHost,
+  Session,
+  startSession
+} from "@autorest/extension-base";
 import { CodeModel, codeModelSchema } from "@autorest/codemodel";
 import { extractAutorestOptions } from "./utils/autorestOptions";
 import { PackageDetails } from "./models/packageDetails";
-import { TracingInfo } from "./models/clientDetails";
+import { DependencyInfo, TracingInfo } from "./models/clientDetails";
 
 export interface AutorestOptions {
   restLevelClient?: boolean;
+  rlcShortcut?: boolean;
   azureArm?: boolean;
   addCredentials?: boolean;
-  credentialKeyHeaderName?: string;
-  credentialScopes?: string[];
+  security?: string;
+  securityHeaderName?: string;
+  securityScopes?: string | string[];
   srcPath: string;
   outputPath?: string;
   title?: string;
@@ -25,24 +31,26 @@ export interface AutorestOptions {
   skipEnumValidation?: boolean;
   azureOutputDirectory?: string;
   headAsBoolean?: boolean;
+  isTestPackage?: boolean;
+  generateTest?: boolean;
+  batch?: [string, any][];
+  multiClient?: boolean;
+  generateSample?: boolean;
+  azureSdkForJs?: boolean;
+  productDocLink?: string;
+  coreHttpCompatMode?: boolean;
+  dependencyInfo?: DependencyInfo;
+  lenientModelDeduplication?: boolean;
 }
 
-let host: Host;
+let host: AutorestExtensionHost;
 let session: Session<CodeModel>;
 let options: AutorestOptions;
 
-export async function initializeSession(autorestHost: Host) {
-  if (!host) {
-    host = autorestHost;
-  }
-
-  if (!session) {
-    session = await startSession<CodeModel>(host, undefined, codeModelSchema);
-  }
-
-  if (!options) {
-    options = await extractAutorestOptions();
-  }
+export async function initializeSession(autorestHost: AutorestExtensionHost) {
+  host = autorestHost;
+  session = await startSession<CodeModel>(host, codeModelSchema);
+  options = await extractAutorestOptions();
 }
 
 export function getSession(): Session<CodeModel> {
@@ -55,7 +63,7 @@ export function getSession(): Session<CodeModel> {
   return session;
 }
 
-export function getHost(): Host {
+export function getHost(): AutorestExtensionHost {
   if (!host) {
     throw new Error(
       "Host has not been initialized, make sure to call initializeSession early in the plugin startup"

package/src/conflictResolver.ts

@@ -0,0 +1,61 @@
+import { ClientDetails } from "./models/clientDetails";
+
+const RESERVED_MEMBER_NAMES = ["pipeline"];
+
+export function conflictResolver(clientDetails: ClientDetails) {
+  resolveConflictWithOperationGroupNames(clientDetails);
+}
+
+function resolveConflictWithOperationGroupNames(clientDetails: ClientDetails) {
+  clientDetails.operationGroups.forEach(operationGroup => {
+    const isConflict: boolean = checkForConflictWithDefinitions(
+      operationGroup.name,
+      clientDetails
+    );
+
+    if (isConflict) {
+      if (
+        !checkForConflictWithOperationGroupName(
+          `${operationGroup.name}Operations`,
+          clientDetails
+        )
+      ) {
+        operationGroup.name = `${operationGroup.name}Operations`;
+        operationGroup.key = `${operationGroup.key}Operations`;
+      } else {
+        operationGroup.name = `${operationGroup.name}OperationGrp`;
+        operationGroup.key = `${operationGroup.key}OperationGrp`;
+      }
+    }
+  });
+}
+
+function checkForConflictWithDefinitions(
+  operationGroupName: string,
+  clientDetails: ClientDetails
+): boolean {
+  if (RESERVED_MEMBER_NAMES.includes(operationGroupName.toLowerCase())) {
+    return true;
+  }
+
+  for (const model of clientDetails.objects) {
+    if (model.name === operationGroupName) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+function checkForConflictWithOperationGroupName(
+  operationGroupName: string,
+  clientDetails: ClientDetails
+): boolean {
+  for (const og of clientDetails.operationGroups) {
+    if (og.name === operationGroupName) {
+      return true;
+    }
+  }
+
+  return false;
+}

package/src/generators/LROGenerator.ts

@@ -9,27 +9,13 @@ export async function generateLroFiles(
   clientDetails: ClientDetails,
   project: Project
 ) {
-  const { srcPath, useCoreV2 } = getAutorestOptions();
+  const { srcPath } = getAutorestOptions();
   if (!hasAnyLro(clientDetails.operationGroups)) {
     return;
   }
-  const LroClassFile = useCoreV2 ? "coreClientLro.ts" : "coreHttpLro.ts";
+  const LroClassFile = "lroImpl.ts";
   const baseTargetPath = srcPath || "";
   const srcDir = joinPath(__dirname, "..", "..", "..", "src");
-  const lroDir = joinPath(srcDir, "lro");
-  const lroFiles = await promises.readdir(lroDir);
-
-  for (let i = 0; i < lroFiles.length; i++) {
-    const file = lroFiles[i];
-    const filePath = joinPath(lroDir, file);
-    const fileContent = await promises.readFile(filePath, "utf-8");
-
-    project.createSourceFile(
-      joinPath(baseTargetPath, "lro", file),
-      fileContent,
-      { overwrite: true }
-    );
-  }
   const fileContent = await promises.readFile(
     joinPath(srcDir, LroClassFile),
     "utf-8"