Update codemodel pacakge (#865)

* Update codemodel dependency package

* update smoke packages

package.json

@@ -30,9 +30,9 @@
         "LICENSE"
     ],
     "dependencies": {
-        "@autorest/extension-base": "^3.1.0",
+        "@autorest/codemodel": "^4.14.5",
+        "@autorest/extension-base": "^3.2.0",
         "@azure-tools/codegen": "^2.4.267",
-        "@azure-tools/codemodel": "^4.13.339",
         "@azure/core-http": "^1.2.1-alpha.20201203.2",
         "@azure/core-lro": "^1.0.1",
         "@azure/core-paging": "^1.1.3",
@@ -71,7 +71,7 @@
         "karma-source-map-support": "^1.4.0",
         "karma-typescript": "^5.0.3",
         "karma-typescript-es6-transform": "^5.0.3",
-        "mocha": "6.2.1",
+        "mocha": "^6.2.1",
         "mocha-typescript": "1.1.17",
         "moment": "^2.24.0",
         "node-cmd": "^3.0.0",

src/generators/clientContextFileGenerator.ts

@@ -13,7 +13,7 @@ import { normalizeName, NameType } from "../utils/nameUtils";
 import { ClientDetails } from "../models/clientDetails";
 import { PackageDetails } from "../models/packageDetails";
 import { ParameterDetails } from "../models/parameterDetails";
-import { ImplementationLocation, SchemaType } from "@azure-tools/codemodel";
+import { ImplementationLocation, SchemaType } from "@autorest/codemodel";
 import { EndpointDetails } from "../transforms/urlTransforms";
 import { formatJsDocParam } from "./utils/parameterUtils";
 
@@ -50,11 +50,13 @@ export function generateClientContext(
 
   const contextClass = buildClass(sourceFile, clientContextClassName);
 
-  if(hideClients) {
+  if (hideClients) {
     contextClass.addJsDoc({
-      tags: [{
+      tags: [
+        {
           tagName: "hidden"
-      }],
+        }
+      ]
     });
   }
 

src/generators/clientFileGenerator.ts

@@ -14,7 +14,7 @@ import {
   writeGetOperationOptions
 } from "./operationGenerator";
 import { normalizeName, NameType } from "../utils/nameUtils";
-import { ImplementationLocation, SchemaType } from "@azure-tools/codemodel";
+import { ImplementationLocation, SchemaType } from "@autorest/codemodel";
 import {
   OperationDetails,
   OperationGroupDetails
@@ -27,7 +27,11 @@ import { addPagingImports } from "./utils/pagingOperations";
 
 type OperationDeclarationDetails = { name: string; typeName: string };
 
-export function generateClient(clientDetails: ClientDetails, project: Project, hideClients: boolean) {
+export function generateClient(
+  clientDetails: ClientDetails,
+  project: Project,
+  hideClients: boolean
+) {
   const clientContextClassName = `${clientDetails.className}Context`;
   const hasMappers = !!clientDetails.mappers.length;
 
@@ -123,11 +127,13 @@ export function generateClient(clientDetails: ClientDetails, project: Project, h
     isExported: true
   });
 
-  if(hideClients) {
+  if (hideClients) {
     clientClass.addJsDoc({
-      tags: [{
+      tags: [
+        {
           tagName: "hidden"
-      }],
+        }
+      ]
     });
   }
 

src/generators/modelsGenerator.ts

@@ -32,7 +32,7 @@ import {
   ImplementationLocation,
   Parameter,
   SchemaType
-} from "@azure-tools/codemodel";
+} from "@autorest/codemodel";
 import { KnownMediaType } from "@azure-tools/codegen";
 import { getStringForValue } from "../utils/valueHelpers";
 import { getLanguageMetadata } from "../utils/languageHelpers";

src/generators/operationGenerator.ts

@@ -32,7 +32,7 @@ import {
   ChoiceSchema,
   SealedChoiceSchema,
   ConstantSchema
-} from "@azure-tools/codemodel";
+} from "@autorest/codemodel";
 import { getLanguageMetadata } from "../utils/languageHelpers";
 import { shouldImportParameters } from "./utils/importUtils";
 import {

src/generators/parametersGenerator.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { ParameterLocation } from "@azure-tools/codemodel";
+import { ParameterLocation } from "@autorest/codemodel";
 import {
   Project,
   VariableDeclarationKind,

src/generators/utils/parameterUtils.ts

@@ -11,7 +11,7 @@ import {
   SchemaType,
   ParameterLocation,
   Parameter
-} from "@azure-tools/codemodel";
+} from "@autorest/codemodel";
 import { wrapString, IndentationType } from "./stringUtils";
 import { ClassDeclaration } from "ts-morph";
 import { ParameterWithDescription } from "./docsUtils";

src/main.ts

@@ -7,7 +7,7 @@ import {
   startSession
 } from "@autorest/extension-base";
 import { generateTypeScriptLibrary } from "./typescriptGenerator";
-import { CodeModel, codeModelSchema } from "@azure-tools/codemodel";
+import { CodeModel, codeModelSchema } from "@autorest/codemodel";
 
 export async function processRequest(host: Host) {
   try {

src/models/modelDetails.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { ObjectSchema } from "@azure-tools/codemodel";
+import { ObjectSchema } from "@autorest/codemodel";
 
 export type ObjectDetails =
   | BasicObjectDetails

src/models/operationDetails.ts

@@ -6,7 +6,7 @@ import {
   Language as ModelerLanguage,
   Parameter,
   VirtualParameter
-} from "@azure-tools/codemodel";
+} from "@autorest/codemodel";
 import { KnownMediaType } from "@azure-tools/codegen";
 import { Mapper } from "@azure/core-http";
 import { ParameterDetails } from "./parameterDetails";

src/models/parameterDetails.ts

@@ -7,7 +7,7 @@ import {
   AllSchemaTypes,
   ImplementationLocation,
   VirtualParameter
-} from "@azure-tools/codemodel";
+} from "@autorest/codemodel";
 import { Mapper } from "@azure/core-http";
 import { TypeDetails } from "./modelDetails";
 import { KnownMediaType } from "@azure-tools/codegen";

src/models/unionDetails.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { SchemaType } from "@azure-tools/codemodel";
+import { SchemaType } from "@autorest/codemodel";
 
 /**
  * Details of a typed value union, transformed from ChoiceSchema.

src/transforms/extensions.ts

@@ -9,7 +9,7 @@ import {
   Protocol,
   ParameterLocation,
   ImplementationLocation
-} from "@azure-tools/codemodel";
+} from "@autorest/codemodel";
 import { cloneOperation } from "../utils/cloneOperation";
 import { extractPaginationDetails } from "../utils/extractPaginationDetails";
 import { getLanguageMetadata } from "../utils/languageHelpers";

src/transforms/groupTransforms.ts

@@ -3,7 +3,7 @@ import {
   GroupSchema,
   GroupProperty,
   ObjectSchema
-} from "@azure-tools/codemodel";
+} from "@autorest/codemodel";
 import { getLanguageMetadata } from "../utils/languageHelpers";
 import { ObjectDetails, ObjectKind } from "../models/modelDetails";
 import { transformProperty } from "./objectTransforms";