diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 4f70d306e8b..a48e4989585 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -1,11 +1,11 @@ lockfileVersion: 5.3 specifiers: + '@autorest/codemodel': ~4.15.0 + '@autorest/extension-base': ~3.1.0 '@azure-tools/async-io': ~3.0.0 - '@azure-tools/autorest-extension-base': ~3.1.0 '@azure-tools/codegen': ~2.5.276 '@azure-tools/codegen-csharp': ~3.0.0 - '@azure-tools/codemodel': ~4.13.342 '@azure-tools/codemodel-v3': ~3.1.0 '@azure-tools/linq': ~3.1.0 '@azure-tools/tasks': ~3.0.0 @@ -27,11 +27,11 @@ specifiers: xmlbuilder: 10.1.1 dependencies: + '@autorest/codemodel': 4.15.0 + '@autorest/extension-base': 3.1.0 '@azure-tools/async-io': 3.0.254 - '@azure-tools/autorest-extension-base': 3.1.267 '@azure-tools/codegen': 2.5.294 '@azure-tools/codegen-csharp': 3.0.264 - '@azure-tools/codemodel': 4.13.349 '@azure-tools/codemodel-v3': 3.1.266 '@azure-tools/linq': 3.1.263 '@azure-tools/tasks': 3.0.255 @@ -54,6 +54,23 @@ dependencies: packages: + /@autorest/codemodel/4.15.0: + resolution: {integrity: sha512-KfFS4sUT9ac5foVg3HhWYmXJqD6+jeWTlgfAEo9YIJ7dPo+6IK1CmOzzenTTzHRokWEAS2+Fswq8y0vK6BReRA==} + engines: {node: '>=10.13.0'} + dependencies: + '@azure-tools/codegen': 2.5.294 + '@azure-tools/linq': 3.1.263 + js-yaml: 4.0.0 + dev: false + + /@autorest/extension-base/3.1.0: + resolution: {integrity: sha512-LHSLvPDG0uoMsOmzh0wOtxHu0dvoTaqDRJkgJVAZFVz4VfLocXhFActkwQ31yoB0IO7phZnuvcG8NcvKObURAQ==} + dependencies: + '@azure-tools/codegen': 2.5.294 + js-yaml: 3.13.1 + vscode-jsonrpc: 3.6.2 + dev: false + /@azure-tools/async-io/3.0.254: resolution: {integrity: sha512-X1C7XdyCuo50ch9FzKtTvmK18FgDxxf1Bbt3cSoknQqeDaRegHSSCO+zByq2YA4NvUzKXeZ1engh29IDxZXgpQ==} engines: {node: '>=10.12.0'} @@ -2921,10 +2938,12 @@ packages: dev: false file:projects/powershell.tgz: - resolution: {integrity: sha512-F/4/FcHerLAcdncEgmwWaeAtTYM4hzJPaGve1/6qaC0aELDgi5xkMytbn9Od9WQtMDg+NMG1yxd6xN06Blw7tw==, tarball: file:projects/powershell.tgz} + resolution: {integrity: sha512-hwLOLUYCBTF7JDfiW9hRsFwUflWZCrO/teOveBisoBmy6cCWA5xnXT0eHNDy+yJa8gGWF/scueGhSYKfyn6JlQ==, tarball: file:projects/powershell.tgz} name: '@rush-temp/powershell' version: 0.0.0 dependencies: + '@autorest/codemodel': 4.15.0 + '@autorest/extension-base': 3.1.0 '@azure-tools/async-io': 3.0.254 '@azure-tools/autorest-extension-base': 3.1.267 '@azure-tools/codegen': 2.5.294 diff --git a/powershell/autorest-configuration.md b/powershell/autorest-configuration.md index 1eeeec43826..da48b29cdb6 100644 --- a/powershell/autorest-configuration.md +++ b/powershell/autorest-configuration.md @@ -12,13 +12,14 @@ modelerfour: additional-checks: false always-create-content-type-parameter: false always-seal-x-ms-enums: true + treat-type-object-as-anything: true ``` > if the modeler is loaded already, use that one, otherwise grab it. ``` yaml !isLoaded('@autorest/modelerfour') use-extension: - "@autorest/modelerfour": "4.15.414" + "@autorest/modelerfour": "4.23.1" # will use highest 2.0.x ``` diff --git a/powershell/cmdlets/class.ts b/powershell/cmdlets/class.ts index 3d8f569cd03..ee459564df9 100644 --- a/powershell/cmdlets/class.ts +++ b/powershell/cmdlets/class.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Schema as NewSchema, SchemaType, ArraySchema, SchemaResponse, HttpParameter, ObjectSchema, BinaryResponse, DictionarySchema, ChoiceSchema, SealedChoiceSchema } from '@azure-tools/codemodel'; +import { Schema as NewSchema, SchemaType, ArraySchema, SchemaResponse, HttpParameter, ObjectSchema, BinaryResponse, DictionarySchema, ChoiceSchema, SealedChoiceSchema } from '@autorest/codemodel'; import { command, getAllProperties, JsonType, http, getAllPublicVirtualProperties, getVirtualPropertyFromPropertyName, ParameterLocation, getAllVirtualProperties, VirtualParameter, VirtualProperty } from '@azure-tools/codemodel-v3'; import { CommandOperation, VirtualParameter as NewVirtualParameter } from '../utils/command-operation'; import { getAllProperties as NewGetAllProperties, getAllPublicVirtualProperties as NewGetAllPublicVirtualProperties, getVirtualPropertyFromPropertyName as NewGetVirtualPropertyFromPropertyName, VirtualProperty as NewVirtualProperty } from '../utils/schema'; @@ -16,7 +16,7 @@ import { import { ClientRuntime, EventListener, Schema, ArrayOf, EnumImplementation } from '../llcsharp/exports'; import { Alias, ArgumentCompleterAttribute, AsyncCommandRuntime, AsyncJob, CmdletAttribute, ErrorCategory, ErrorRecord, Events, InvocationInfo, OutputTypeAttribute, ParameterAttribute, PSCmdlet, PSCredential, SwitchParameter, ValidateNotNull, verbEnum, GeneratedAttribute, DescriptionAttribute, CategoryAttribute, ParameterCategory, ProfileAttribute, PSObject, InternalExportAttribute, ExportAsAttribute, DefaultRunspace, RunspaceFactory, AllowEmptyCollectionAttribute, DoNotExportAttribute } from '../internal/powershell-declarations'; import { State } from '../internal/state'; -import { Channel } from '@azure-tools/autorest-extension-base'; +import { Channel } from '@autorest/extension-base'; import { IParameter } from '@azure-tools/codemodel-v3/dist/code-model/components'; import { IParameter as NewIParameter } from '../utils/components'; import { Variable, Local, ParameterModifier } from '@azure-tools/codegen-csharp'; diff --git a/powershell/generators/gitignore.ts b/powershell/generators/gitignore.ts index da00b384475..15afb511bbd 100644 --- a/powershell/generators/gitignore.ts +++ b/powershell/generators/gitignore.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Host } from '@azure-tools/autorest-extension-base'; +import { Host } from '@autorest/extension-base'; import { Project } from '../internal/project'; export async function generateGitIgnore(project: Project) { diff --git a/powershell/generators/nuspec.ts b/powershell/generators/nuspec.ts index d6773154e16..a6e1b756cec 100644 --- a/powershell/generators/nuspec.ts +++ b/powershell/generators/nuspec.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Host } from '@azure-tools/autorest-extension-base'; +import { Host } from '@autorest/extension-base'; import { Project } from '../internal/project'; function removeCd(path: string): string { diff --git a/powershell/generators/psm1.custom.ts b/powershell/generators/psm1.custom.ts index 7977240814d..e81491821fe 100644 --- a/powershell/generators/psm1.custom.ts +++ b/powershell/generators/psm1.custom.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Host } from '@azure-tools/autorest-extension-base'; +import { Host } from '@autorest/extension-base'; import { Project } from '../internal/project'; import { PSScriptFile } from '../file-formats/psscript-file'; import { relative } from 'path'; diff --git a/powershell/generators/psm1.internal.ts b/powershell/generators/psm1.internal.ts index 76911b9c45a..b86e7ec772b 100644 --- a/powershell/generators/psm1.internal.ts +++ b/powershell/generators/psm1.internal.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Host } from '@azure-tools/autorest-extension-base'; +import { Host } from '@autorest/extension-base'; import { Project } from '../internal/project'; import { PSScriptFile } from '../file-formats/psscript-file'; import { relative } from 'path'; diff --git a/powershell/internal/name-inferrer.ts b/powershell/internal/name-inferrer.ts index 76ffc0bdb73..11cad75dd59 100644 --- a/powershell/internal/name-inferrer.ts +++ b/powershell/internal/name-inferrer.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { pascalCase, EnglishPluralizationService } from '@azure-tools/codegen'; -import { Channel, Message } from '@azure-tools/autorest-extension-base'; +import { Channel, Message } from '@autorest/extension-base'; import { length } from '@azure-tools/linq'; function getPluralizationService(): EnglishPluralizationService { diff --git a/powershell/internal/project.ts b/powershell/internal/project.ts index 483da4df53c..d8c6f71a5fe 100644 --- a/powershell/internal/project.ts +++ b/powershell/internal/project.ts @@ -13,12 +13,12 @@ import { pwshHeaderText } from '../utils/powershell-comment'; import { ModuleNamespace } from '../module/module-namespace'; import { CmdletNamespace } from '../cmdlets/namespace'; -import { Host } from '@azure-tools/autorest-extension-base'; +import { Host } from '@autorest/extension-base'; import { codemodel, PropertyDetails, exportedModels as T } from '@azure-tools/codemodel-v3'; import { DeepPartial, comment } from '@azure-tools/codegen'; import { PwshModel } from '../utils/PwshModel'; import { ModelState } from '../utils/model-state'; -import { BooleanSchema, ChoiceSchema, ConstantSchema, Schema as NewSchema, SchemaType } from '@azure-tools/codemodel'; +import { BooleanSchema, ChoiceSchema, ConstantSchema, Schema as NewSchema, SchemaType } from '@autorest/codemodel'; export type Schema = T.SchemaT, LanguageDetails>; diff --git a/powershell/internal/state.ts b/powershell/internal/state.ts index c5253f50958..614b1b57126 100644 --- a/powershell/internal/state.ts +++ b/powershell/internal/state.ts @@ -5,7 +5,7 @@ import { codemodel } from '@azure-tools/codemodel-v3'; -import { Host, JsonPath, Session } from '@azure-tools/autorest-extension-base'; +import { Host, JsonPath, Session } from '@autorest/extension-base'; import { Project } from './project'; import { DeepPartial } from '@azure-tools/codegen'; import { PwshModel } from '../utils/PwshModel'; diff --git a/powershell/llcsharp/enums/enum.ts b/powershell/llcsharp/enums/enum.ts index b19f2ba1bf0..05536e940fd 100644 --- a/powershell/llcsharp/enums/enum.ts +++ b/powershell/llcsharp/enums/enum.ts @@ -25,7 +25,7 @@ import { EnhancedTypeDeclaration } from '../schema/extended-type-declaration'; import { State } from '../generator'; import { DeepPartial } from '@azure-tools/codegen'; -import { Schema as NewSchema } from '@azure-tools/codemodel'; +import { Schema as NewSchema } from '@autorest/codemodel'; export class EnumClass extends Struct implements EnhancedTypeDeclaration { implementation: EnumImplementation; diff --git a/powershell/llcsharp/generator.ts b/powershell/llcsharp/generator.ts index b24d9690c6d..a3eda923a04 100644 --- a/powershell/llcsharp/generator.ts +++ b/powershell/llcsharp/generator.ts @@ -3,9 +3,9 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { codeModelSchema } from '@azure-tools/codemodel'; +import { codeModelSchema } from '@autorest/codemodel'; import { Model } from './code-model'; -import { Host, JsonPath, Session, startSession } from '@azure-tools/autorest-extension-base'; +import { Host, JsonPath, Session, startSession } from '@autorest/extension-base'; import { Project } from './project'; import { Dictionary } from '@azure-tools/linq'; diff --git a/powershell/llcsharp/model/interface.ts b/powershell/llcsharp/model/interface.ts index 738a7a5ed00..830af99c832 100644 --- a/powershell/llcsharp/model/interface.ts +++ b/powershell/llcsharp/model/interface.ts @@ -8,7 +8,7 @@ import { KnownMediaType, JsonType, getPolymorphicBases } from '@azure-tools/code import { Expression, ExpressionOrLiteral, Interface, Namespace, OneOrMoreStatements, Variable, Access, InterfaceProperty, Attribute, StringExpression, LiteralExpression, Property, TypeDeclaration } from '@azure-tools/codegen-csharp'; import { ClientRuntime } from '../clientruntime'; import { Schema } from '../code-model'; -import { Schema as NewSchema, Language, ObjectSchema } from '@azure-tools/codemodel'; +import { Schema as NewSchema, Language, ObjectSchema } from '@autorest/codemodel'; import { State } from '../generator'; import { EnhancedTypeDeclaration } from '../schema/extended-type-declaration'; import { ModelClass } from './model-class'; diff --git a/powershell/llcsharp/model/model-class-dictionary.ts b/powershell/llcsharp/model/model-class-dictionary.ts index fe5be9aa697..c52bf4addc6 100644 --- a/powershell/llcsharp/model/model-class-dictionary.ts +++ b/powershell/llcsharp/model/model-class-dictionary.ts @@ -8,7 +8,7 @@ import { EnhancedTypeDeclaration } from '../schema/extended-type-declaration'; import { ClientRuntime } from '../clientruntime'; import { getAllVirtualProperties } from '@azure-tools/codemodel-v3'; import { DeepPartial } from '@azure-tools/codegen'; -import { DictionarySchema, ObjectSchema, SchemaType, Schema } from '@azure-tools/codemodel'; +import { DictionarySchema, ObjectSchema, SchemaType, Schema } from '@autorest/codemodel'; export class DictionaryImplementation extends Class { private get state() { return this.modelClass.state; } diff --git a/powershell/llcsharp/model/model-class-json.ts b/powershell/llcsharp/model/model-class-json.ts index 64681e1e332..d0a5ea5d664 100644 --- a/powershell/llcsharp/model/model-class-json.ts +++ b/powershell/llcsharp/model/model-class-json.ts @@ -2,9 +2,9 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Schema as NewSchema, ObjectSchema, SchemaType } from '@azure-tools/codemodel'; +import { Schema as NewSchema, ObjectSchema, SchemaType } from '@autorest/codemodel'; import { KnownMediaType, HeaderProperty, HeaderPropertyType, getAllProperties } from '@azure-tools/codemodel-v3'; -import { getAllProperties as newGetAllProperties } from '@azure-tools/codemodel'; +import { getAllProperties as newGetAllProperties } from '@autorest/codemodel'; import { EOL, DeepPartial, } from '@azure-tools/codegen'; import { items, values, keys, Dictionary, length } from '@azure-tools/linq'; import { Access, Modifier, StringExpression, Expression, System } from '@azure-tools/codegen-csharp'; diff --git a/powershell/llcsharp/model/model-class-serializer.ts b/powershell/llcsharp/model/model-class-serializer.ts index 341719c912f..e4c44330aa7 100644 --- a/powershell/llcsharp/model/model-class-serializer.ts +++ b/powershell/llcsharp/model/model-class-serializer.ts @@ -28,7 +28,7 @@ import { popTempVar, pushTempVar } from '../schema/primitive'; import { ObjectImplementation } from '../schema/object'; import { Schema } from '../code-model'; -import { DictionarySchema, ObjectSchema, Schema as NewSchema, SchemaType } from '@azure-tools/codemodel'; +import { DictionarySchema, ObjectSchema, Schema as NewSchema, SchemaType } from '@autorest/codemodel'; import { getVirtualPropertyName } from './model-class'; import { VirtualProperty as NewVirtualProperty } from '../../utils/schema'; diff --git a/powershell/llcsharp/model/model-class.ts b/powershell/llcsharp/model/model-class.ts index 8c84dda3e07..2993da2f462 100644 --- a/powershell/llcsharp/model/model-class.ts +++ b/powershell/llcsharp/model/model-class.ts @@ -16,7 +16,7 @@ import { ModelProperty } from './property'; import { PropertyOriginAttribute, DoNotFormatAttribute, FormatTableAttribute } from '../csharp-declarations'; import { Schema } from '../code-model'; import { DictionaryImplementation } from './model-class-dictionary'; -import { Languages, Language, Schema as NewSchema, SchemaType, ObjectSchema, DictionarySchema } from '@azure-tools/codemodel'; +import { Languages, Language, Schema as NewSchema, SchemaType, ObjectSchema, DictionarySchema } from '@autorest/codemodel'; import { VirtualProperty as NewVirtualProperty, getAllVirtualProperties as newGetAllVirtualProperties } from '../../utils/schema'; export function getVirtualPropertyName(vp?: NewVirtualProperty): string { diff --git a/powershell/llcsharp/model/namespace.ts b/powershell/llcsharp/model/namespace.ts index 5eb8d2fa986..1105bee59ed 100644 --- a/powershell/llcsharp/model/namespace.ts +++ b/powershell/llcsharp/model/namespace.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Schema as NewSchema, Schemas as NewSchemas, Language } from '@azure-tools/codemodel'; +import { Schema as NewSchema, Schemas as NewSchemas, Language } from '@autorest/codemodel'; import { items, values, keys, Dictionary, length } from '@azure-tools/linq'; import { ImportDirective, Namespace } from '@azure-tools/codegen-csharp'; import { ClientRuntime } from '../clientruntime'; diff --git a/powershell/llcsharp/model/property.ts b/powershell/llcsharp/model/property.ts index 94a82a74ee4..ea43893f817 100644 --- a/powershell/llcsharp/model/property.ts +++ b/powershell/llcsharp/model/property.ts @@ -16,7 +16,7 @@ import { EnhancedTypeDeclaration } from '../schema/extended-type-declaration'; import { State } from '../generator'; import { DeepPartial } from '@azure-tools/codegen'; -import { Schema as NewSchema, SchemaType } from '@azure-tools/codemodel'; +import { Schema as NewSchema, SchemaType } from '@autorest/codemodel'; export class ModelProperty extends BackedProperty implements EnhancedVariable { /** emits an expression to deserialize a property from a member inside a container */ diff --git a/powershell/llcsharp/operation/method.ts b/powershell/llcsharp/operation/method.ts index 81ef1716bb3..da8d359a642 100644 --- a/powershell/llcsharp/operation/method.ts +++ b/powershell/llcsharp/operation/method.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { NewResponse, ParameterLocation } from '@azure-tools/codemodel-v3'; -import { Operation, SchemaResponse, BinaryResponse, Schema as NewSchema, Response, BinarySchema } from '@azure-tools/codemodel'; +import { Operation, SchemaResponse, BinaryResponse, Schema as NewSchema, Response, BinarySchema } from '@autorest/codemodel'; import { items, values, keys, Dictionary, length } from '@azure-tools/linq'; import { EOL, DeepPartial } from '@azure-tools/codegen'; import { Access, Modifier } from '@azure-tools/codegen-csharp'; diff --git a/powershell/llcsharp/operation/parameter.ts b/powershell/llcsharp/operation/parameter.ts index e46c779bedb..a96d5d83f6d 100644 --- a/powershell/llcsharp/operation/parameter.ts +++ b/powershell/llcsharp/operation/parameter.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { Method } from '@azure-tools/codegen-csharp'; -import { Parameter as NewHttpOperationParameter, Schema as NewSchema } from '@azure-tools/codemodel'; +import { Parameter as NewHttpOperationParameter, Schema as NewSchema } from '@autorest/codemodel'; import { KnownMediaType } from '@azure-tools/codemodel-v3'; import { System } from '@azure-tools/codegen-csharp'; import { Expression, ExpressionOrLiteral } from '@azure-tools/codegen-csharp'; diff --git a/powershell/llcsharp/project.ts b/powershell/llcsharp/project.ts index 6c8818110ad..8a21b5de6f9 100644 --- a/powershell/llcsharp/project.ts +++ b/powershell/llcsharp/project.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Host } from '@azure-tools/autorest-extension-base'; +import { Host } from '@autorest/extension-base'; import { items, values, keys, Dictionary, length } from '@azure-tools/linq'; import { Project as codeDomProject } from '@azure-tools/codegen-csharp'; diff --git a/powershell/llcsharp/schema/Uuid.ts b/powershell/llcsharp/schema/Uuid.ts index 75034805561..c6be5b0992b 100644 --- a/powershell/llcsharp/schema/Uuid.ts +++ b/powershell/llcsharp/schema/Uuid.ts @@ -6,7 +6,7 @@ import { nameof } from '@azure-tools/codegen'; import { Variable } from '@azure-tools/codegen-csharp'; import { Schema } from '../code-model'; -import { StringSchema } from '@azure-tools/codemodel'; +import { StringSchema } from '@autorest/codemodel'; import { String } from './string'; diff --git a/powershell/llcsharp/schema/array.ts b/powershell/llcsharp/schema/array.ts index cdc42090ca9..d42828062f9 100644 --- a/powershell/llcsharp/schema/array.ts +++ b/powershell/llcsharp/schema/array.ts @@ -15,7 +15,7 @@ import { Ternery } from '@azure-tools/codegen-csharp'; import { LocalVariable, Variable } from '@azure-tools/codegen-csharp'; import { ClientRuntime } from '../clientruntime'; import { Schema } from '../code-model'; -import { Schema as NewSchema } from '@azure-tools/codemodel'; +import { Schema as NewSchema } from '@autorest/codemodel'; import { popTempVar, pushTempVar } from '../schema/primitive'; diff --git a/powershell/llcsharp/schema/binary.ts b/powershell/llcsharp/schema/binary.ts index 49091f193c8..e184b46ef5a 100644 --- a/powershell/llcsharp/schema/binary.ts +++ b/powershell/llcsharp/schema/binary.ts @@ -11,7 +11,7 @@ import { OneOrMoreStatements } from '@azure-tools/codegen-csharp'; import { Variable } from '@azure-tools/codegen-csharp'; import { Schema } from '../code-model'; import { EnhancedTypeDeclaration } from './extended-type-declaration'; -import { BinarySchema } from '@azure-tools/codemodel'; +import { BinarySchema } from '@autorest/codemodel'; export class Binary implements EnhancedTypeDeclaration { diff --git a/powershell/llcsharp/schema/boolean.ts b/powershell/llcsharp/schema/boolean.ts index 342b75a0ea3..e58c1c54ee9 100644 --- a/powershell/llcsharp/schema/boolean.ts +++ b/powershell/llcsharp/schema/boolean.ts @@ -6,7 +6,7 @@ import { Variable } from '@azure-tools/codegen-csharp'; import { ClientRuntime } from '../clientruntime'; import { Schema } from '../code-model'; -import { Schema as NewSchema, BooleanSchema } from '@azure-tools/codemodel'; +import { Schema as NewSchema, BooleanSchema } from '@autorest/codemodel'; import { NewPrimitive } from './primitive'; export class Boolean extends NewPrimitive { diff --git a/powershell/llcsharp/schema/byte-array.ts b/powershell/llcsharp/schema/byte-array.ts index 0fb87599386..62e51574304 100644 --- a/powershell/llcsharp/schema/byte-array.ts +++ b/powershell/llcsharp/schema/byte-array.ts @@ -10,7 +10,7 @@ import { If } from '@azure-tools/codegen-csharp'; import { OneOrMoreStatements } from '@azure-tools/codegen-csharp'; import { Variable } from '@azure-tools/codegen-csharp'; import { Schema } from '../code-model'; -import { Schema as NewSchema, ByteArraySchema } from '@azure-tools/codemodel'; +import { Schema as NewSchema, ByteArraySchema } from '@autorest/codemodel'; import { popTempVar, pushTempVar } from './primitive'; import { EnhancedTypeDeclaration } from './extended-type-declaration'; import { ClientRuntime } from '../clientruntime'; diff --git a/powershell/llcsharp/schema/char.ts b/powershell/llcsharp/schema/char.ts index d894a7487cd..0cc5cb1debe 100644 --- a/powershell/llcsharp/schema/char.ts +++ b/powershell/llcsharp/schema/char.ts @@ -6,7 +6,7 @@ import { Variable } from '@azure-tools/codegen-csharp'; import { ClientRuntime } from '../clientruntime'; import { Schema } from '../code-model'; -import { Schema as NewSchema, SchemaType, ChoiceSchema, ChoiceValue } from '@azure-tools/codemodel'; +import { Schema as NewSchema, SchemaType, ChoiceSchema, ChoiceValue } from '@autorest/codemodel'; import { NewPrimitive } from './primitive'; import { length } from '@azure-tools/linq'; diff --git a/powershell/llcsharp/schema/date-time.ts b/powershell/llcsharp/schema/date-time.ts index e271fb11ff7..3661ca24adf 100644 --- a/powershell/llcsharp/schema/date-time.ts +++ b/powershell/llcsharp/schema/date-time.ts @@ -11,7 +11,7 @@ import { OneOrMoreStatements } from '@azure-tools/codegen-csharp'; import { Variable } from '@azure-tools/codegen-csharp'; import { ClientRuntime } from '../clientruntime'; import { Schema } from '../code-model'; -import { Schema as NewSchema, DateTimeSchema, UnixTimeSchema, DateSchema } from '@azure-tools/codemodel'; +import { Schema as NewSchema, DateTimeSchema, UnixTimeSchema, DateSchema } from '@autorest/codemodel'; import { NewPrimitive } from './primitive'; diff --git a/powershell/llcsharp/schema/date.ts b/powershell/llcsharp/schema/date.ts index c4a48751abe..9e49bf17a23 100644 --- a/powershell/llcsharp/schema/date.ts +++ b/powershell/llcsharp/schema/date.ts @@ -5,7 +5,7 @@ import { StringExpression } from '@azure-tools/codegen-csharp'; import { Schema } from '../code-model'; -import { DateSchema } from '@azure-tools/codemodel'; +import { DateSchema } from '@autorest/codemodel'; import { DateTime } from './date-time'; diff --git a/powershell/llcsharp/schema/duration.ts b/powershell/llcsharp/schema/duration.ts index 711398f9a55..e372148f299 100644 --- a/powershell/llcsharp/schema/duration.ts +++ b/powershell/llcsharp/schema/duration.ts @@ -8,7 +8,7 @@ import { Expression, ExpressionOrLiteral, toExpression, System, valueOf } from ' import { OneOrMoreStatements } from '@azure-tools/codegen-csharp'; import { Variable } from '@azure-tools/codegen-csharp'; import { Schema } from '../code-model'; -import { Schema as NewSchema, DurationSchema } from '@azure-tools/codemodel'; +import { Schema as NewSchema, DurationSchema } from '@autorest/codemodel'; import { NewPrimitive } from './primitive'; import { ClientRuntime } from '../clientruntime'; diff --git a/powershell/llcsharp/schema/enum.ts b/powershell/llcsharp/schema/enum.ts index 798329dbbe0..7c571cac09c 100644 --- a/powershell/llcsharp/schema/enum.ts +++ b/powershell/llcsharp/schema/enum.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { Schema } from '../code-model'; -import { Schema as NewSchema } from '@azure-tools/codemodel'; +import { Schema as NewSchema } from '@autorest/codemodel'; import { String } from './string'; import { dotnet, toExpression } from '@azure-tools/codegen-csharp'; diff --git a/powershell/llcsharp/schema/extended-type-declaration.ts b/powershell/llcsharp/schema/extended-type-declaration.ts index b08fd1ab2c7..fd2024e1c99 100644 --- a/powershell/llcsharp/schema/extended-type-declaration.ts +++ b/powershell/llcsharp/schema/extended-type-declaration.ts @@ -9,7 +9,7 @@ import { OneOrMoreStatements } from '@azure-tools/codegen-csharp'; import { TypeDeclaration } from '@azure-tools/codegen-csharp'; import { Variable } from '@azure-tools/codegen-csharp'; import { Schema } from '../code-model'; -import { Schema as NewSchema } from '@azure-tools/codemodel'; +import { Schema as NewSchema } from '@autorest/codemodel'; /** A TypeDeclaration that can assist in generating code for a variety of serialization, validation and other common use cases */ diff --git a/powershell/llcsharp/schema/integer.ts b/powershell/llcsharp/schema/integer.ts index 0d39024b097..55f163110fb 100644 --- a/powershell/llcsharp/schema/integer.ts +++ b/powershell/llcsharp/schema/integer.ts @@ -7,7 +7,7 @@ import { nameof } from '@azure-tools/codegen'; import { Variable } from '@azure-tools/codegen-csharp'; import { ClientRuntime } from '../clientruntime'; import { Schema } from '../code-model'; -import { NumberSchema } from '@azure-tools/codemodel'; +import { NumberSchema } from '@autorest/codemodel'; import { NewPrimitive } from './primitive'; diff --git a/powershell/llcsharp/schema/object.ts b/powershell/llcsharp/schema/object.ts index cf6a138e813..af54bab7b9f 100644 --- a/powershell/llcsharp/schema/object.ts +++ b/powershell/llcsharp/schema/object.ts @@ -14,7 +14,7 @@ import { Ternery } from '@azure-tools/codegen-csharp'; import { Variable } from '@azure-tools/codegen-csharp'; import { ClientRuntime } from '../clientruntime'; import { Schema } from '../code-model'; -import { Schema as NewSchema, ObjectSchema } from '@azure-tools/codemodel'; +import { Schema as NewSchema, ObjectSchema } from '@autorest/codemodel'; import { popTempVar, pushTempVar } from './primitive'; import { EnhancedTypeDeclaration } from './extended-type-declaration'; diff --git a/powershell/llcsharp/schema/password.ts b/powershell/llcsharp/schema/password.ts index c28ab37648d..17479b27d9b 100644 --- a/powershell/llcsharp/schema/password.ts +++ b/powershell/llcsharp/schema/password.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { Variable } from '@azure-tools/codegen-csharp'; -import { CredentialSchema } from '@azure-tools/codemodel'; +import { CredentialSchema } from '@autorest/codemodel'; import { String } from './string'; import { KnownMediaType } from '@azure-tools/codemodel-v3'; import { camelCase, deconstruct } from '@azure-tools/codegen'; diff --git a/powershell/llcsharp/schema/primitive.ts b/powershell/llcsharp/schema/primitive.ts index 565c293c01c..6d15d7eab6a 100644 --- a/powershell/llcsharp/schema/primitive.ts +++ b/powershell/llcsharp/schema/primitive.ts @@ -14,7 +14,7 @@ import { Ternery } from '@azure-tools/codegen-csharp'; import { Variable } from '@azure-tools/codegen-csharp'; import { ClientRuntime } from '../clientruntime'; import { Schema } from '../code-model'; -import { Schema as NewSchema, PrimitiveSchema } from '@azure-tools/codemodel'; +import { Schema as NewSchema, PrimitiveSchema } from '@autorest/codemodel'; import { EnhancedTypeDeclaration } from './extended-type-declaration'; let tmpVar: number | undefined; diff --git a/powershell/llcsharp/schema/schema-resolver.ts b/powershell/llcsharp/schema/schema-resolver.ts index f3cc0eaef51..b8809fd37c1 100644 --- a/powershell/llcsharp/schema/schema-resolver.ts +++ b/powershell/llcsharp/schema/schema-resolver.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { codeModelSchema, CredentialSchema, ArraySchema, UnixTimeSchema, CodeModel, Schema as NewSchema, StringSchema, BooleanSchema, NumberSchema, ByteArraySchema, DateTimeSchema, ObjectSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, VirtualParameter, getAllProperties, ImplementationLocation, OperationGroup, Request, SchemaContext, ConstantSchema, ChoiceSchema, DurationSchema, BinarySchema, DateSchema } from '@azure-tools/codemodel'; +import { codeModelSchema, CredentialSchema, ArraySchema, UnixTimeSchema, CodeModel, Schema as NewSchema, StringSchema, BooleanSchema, NumberSchema, ByteArraySchema, DateTimeSchema, ObjectSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, VirtualParameter, getAllProperties, ImplementationLocation, OperationGroup, Request, SchemaContext, ConstantSchema, ChoiceSchema, DurationSchema, BinarySchema, DateSchema } from '@autorest/codemodel'; import { codemodel, IntegerFormat, NumberFormat, StringFormat, JsonType } from '@azure-tools/codemodel-v3'; import { Schema } from '../code-model'; @@ -24,7 +24,7 @@ import { Uuid } from './Uuid'; import { EnhancedTypeDeclaration } from './extended-type-declaration'; import { PwshModel } from '../../utils/PwshModel'; import { ModelState } from '../../utils/model-state'; -import { Channel, Host, Session, startSession } from '@azure-tools/autorest-extension-base'; +import { Channel, Host, Session, startSession } from '@autorest/extension-base'; import { schemaHasEnum } from '../validations'; import { Password } from './password'; @@ -51,6 +51,7 @@ export class SchemaDefinitionResolver { } case SchemaType.Any: + case SchemaType.AnyObject: case SchemaType.Dictionary: case SchemaType.Object: { const result = schema.language.csharp && this.cache.get(schema.language.csharp.fullname || ''); diff --git a/powershell/llcsharp/schema/string.ts b/powershell/llcsharp/schema/string.ts index 83763898e3d..68dfdc54db7 100644 --- a/powershell/llcsharp/schema/string.ts +++ b/powershell/llcsharp/schema/string.ts @@ -12,7 +12,7 @@ import { OneOrMoreStatements } from '@azure-tools/codegen-csharp'; import { Variable } from '@azure-tools/codegen-csharp'; import { ClientRuntime } from '../clientruntime'; import { Schema } from '../code-model'; -import { ChoiceSchema, Schema as NewSchema, SchemaType, SealedChoiceSchema, StringSchema } from '@azure-tools/codemodel'; +import { ChoiceSchema, Schema as NewSchema, SchemaType, SealedChoiceSchema, StringSchema } from '@autorest/codemodel'; import { popTempVar, pushTempVar } from './primitive'; import { EnhancedTypeDeclaration } from './extended-type-declaration'; import { length } from '@azure-tools/linq'; diff --git a/powershell/main.ts b/powershell/main.ts index 9eebe7b6292..dc6644c3558 100644 --- a/powershell/main.ts +++ b/powershell/main.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AutoRestExtension, } from '@azure-tools/autorest-extension-base'; +import { AutoRestExtension, } from '@autorest/extension-base'; import { createInlinedPropertiesPlugin } from './plugins/plugin-create-inline-properties'; import { tweakModelPlugin } from './plugins/plugin-tweak-model'; import { tweakModelAzurePluginV2 } from './plugins/plugin-tweak-model-azure-v2'; diff --git a/powershell/models/model-extensions.ts b/powershell/models/model-extensions.ts index 9394418ac00..af4e7d156f3 100644 --- a/powershell/models/model-extensions.ts +++ b/powershell/models/model-extensions.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DictionarySchema, ObjectSchema, Schema as NewSchema, SchemaType } from '@azure-tools/codemodel'; +import { DictionarySchema, ObjectSchema, Schema as NewSchema, SchemaType } from '@autorest/codemodel'; import { items, values, keys, Dictionary, length } from '@azure-tools/linq'; import { Catch, Try, Else, ElseIf, If, Interface, Attribute, Parameter, Modifier, dotnet, Class, LambdaMethod, LiteralExpression, Method, Namespace, System, Return, LocalVariable, Local, PartialMethod, Constructor, IsAssignableFrom, ImportDirective, Property, Access, InterfaceProperty, ParameterModifier } from '@azure-tools/codegen-csharp'; import { Schema, ClientRuntime, ObjectImplementation, SchemaDefinitionResolver, DeserializerPartialClass } from '../llcsharp/exports'; diff --git a/powershell/package.json b/powershell/package.json index dce0aa52079..23ede99bbc0 100644 --- a/powershell/package.json +++ b/powershell/package.json @@ -58,8 +58,8 @@ "@azure-tools/codegen": "~2.5.276", "@azure-tools/codegen-csharp": "~3.0.0", "@azure-tools/codemodel-v3": "~3.1.0", - "@azure-tools/codemodel": "~4.13.342", - "@azure-tools/autorest-extension-base": "~3.1.0", + "@autorest/codemodel": "~4.15.0", + "@autorest/extension-base": "~3.1.0", "@azure-tools/linq": "~3.1.0", "@azure-tools/tasks": "~3.0.0", "@azure-tools/async-io": "~3.0.0", diff --git a/powershell/plugins/add-azure-completers-v2.ts b/powershell/plugins/add-azure-completers-v2.ts index 557ce432631..b9a3e15d375 100644 --- a/powershell/plugins/add-azure-completers-v2.ts +++ b/powershell/plugins/add-azure-completers-v2.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { values } from '@azure-tools/linq'; -import { Host } from '@azure-tools/autorest-extension-base'; +import { Host } from '@autorest/extension-base'; import { PwshModel } from '../utils/PwshModel'; import { ModelState } from '../utils/model-state'; import { serialize } from '@azure-tools/codegen'; diff --git a/powershell/plugins/create-commands-v2.ts b/powershell/plugins/create-commands-v2.ts index fc36205364f..ac4e8f0fb61 100644 --- a/powershell/plugins/create-commands-v2.ts +++ b/powershell/plugins/create-commands-v2.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { HttpMethod, codeModelSchema, CodeModel, ObjectSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, VirtualParameter, getAllProperties, ImplementationLocation, OperationGroup, Request, SchemaContext } from '@azure-tools/codemodel'; +import { HttpMethod, codeModelSchema, CodeModel, ObjectSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, VirtualParameter, getAllProperties, ImplementationLocation, OperationGroup, Request, SchemaContext } from '@autorest/codemodel'; import { deconstruct, fixLeadingNumber, pascalCase, EnglishPluralizationService, fail, removeSequentialDuplicates, serialize } from '@azure-tools/codegen'; import { items, values, keys, Dictionary, length } from '@azure-tools/linq'; import { Schema } from '../llcsharp/exports'; -import { Channel, Host, Session, startSession } from '@azure-tools/autorest-extension-base'; +import { Channel, Host, Session, startSession } from '@autorest/extension-base'; import { Lazy } from '@azure-tools/tasks'; import { clone } from '@azure-tools/linq'; import { verbs } from '../internal/verbs'; diff --git a/powershell/plugins/cs-namer-v2.ts b/powershell/plugins/cs-namer-v2.ts index e294a2f5ac3..8d97d7d9469 100644 --- a/powershell/plugins/cs-namer-v2.ts +++ b/powershell/plugins/cs-namer-v2.ts @@ -3,12 +3,12 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { codeModelSchema, SchemaResponse, CodeModel, Schema, ObjectSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, VirtualParameter, getAllProperties, ImplementationLocation, OperationGroup, Request, SchemaContext, StringSchema, ChoiceSchema, SealedChoiceSchema } from '@azure-tools/codemodel'; +import { codeModelSchema, SchemaResponse, CodeModel, Schema, ObjectSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, VirtualParameter, getAllProperties, ImplementationLocation, OperationGroup, Request, SchemaContext, StringSchema, ChoiceSchema, SealedChoiceSchema } from '@autorest/codemodel'; import { camelCase, deconstruct, excludeXDash, fixLeadingNumber, pascalCase, lowest, maximum, minimum, getPascalIdentifier, serialize } from '@azure-tools/codegen'; import { items, values, keys, Dictionary, length } from '@azure-tools/linq'; import { System } from '@azure-tools/codegen-csharp'; -import { Channel, Host, Session, startSession } from '@azure-tools/autorest-extension-base'; +import { Channel, Host, Session, startSession } from '@autorest/extension-base'; import { SchemaDetails } from '../llcsharp/code-model'; import { SchemaDefinitionResolver } from '../llcsharp/schema/schema-resolver'; import { PwshModel } from '../utils/PwshModel'; diff --git a/powershell/plugins/llcsharp-v2.ts b/powershell/plugins/llcsharp-v2.ts index c90a8a2c61d..b9009534912 100644 --- a/powershell/plugins/llcsharp-v2.ts +++ b/powershell/plugins/llcsharp-v2.ts @@ -2,8 +2,8 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Host, startSession } from '@azure-tools/autorest-extension-base'; -import { codeModelSchema } from '@azure-tools/codemodel'; +import { Host, startSession } from '@autorest/extension-base'; +import { codeModelSchema } from '@autorest/codemodel'; import { applyOverrides, copyResources, deserialize, serialize, } from '@azure-tools/codegen'; import { join } from 'path'; import { Model } from '../llcsharp/code-model'; diff --git a/powershell/plugins/modifiers-v2.ts b/powershell/plugins/modifiers-v2.ts index 1ec96ffdec8..1601e17b7e0 100644 --- a/powershell/plugins/modifiers-v2.ts +++ b/powershell/plugins/modifiers-v2.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Host, Channel } from '@azure-tools/autorest-extension-base'; +import { Host, Channel } from '@autorest/extension-base'; import { pascalCase, serialize, safeEval } from '@azure-tools/codegen'; import { items, values, keys, Dictionary, length } from '@azure-tools/linq'; import { stat } from 'fs'; diff --git a/powershell/plugins/plugin-create-inline-properties.ts b/powershell/plugins/plugin-create-inline-properties.ts index bde55eed827..1c745b84bf0 100644 --- a/powershell/plugins/plugin-create-inline-properties.ts +++ b/powershell/plugins/plugin-create-inline-properties.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { codeModelSchema, CodeModel, ObjectSchema, ConstantSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, ImplementationLocation, OperationGroup, Request, SchemaContext } from '@azure-tools/codemodel'; +import { codeModelSchema, CodeModel, ObjectSchema, ConstantSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, ImplementationLocation, OperationGroup, Request, SchemaContext } from '@autorest/codemodel'; import { getPascalIdentifier, removeSequentialDuplicates, pascalCase, fixLeadingNumber, deconstruct, selectName, EnglishPluralizationService, serialize } from '@azure-tools/codegen'; import { length, values, } from '@azure-tools/linq'; -import { Host, Session, startSession } from '@azure-tools/autorest-extension-base'; +import { Host, Session, startSession } from '@autorest/extension-base'; import { CommandOperation } from '../utils/command-operation'; import { PwshModel } from '../utils/PwshModel'; import { ModelState } from '../utils/model-state'; diff --git a/powershell/plugins/plugin-tweak-m4-model.ts b/powershell/plugins/plugin-tweak-m4-model.ts index 4cd1338935d..6c85f41bc1a 100644 --- a/powershell/plugins/plugin-tweak-m4-model.ts +++ b/powershell/plugins/plugin-tweak-m4-model.ts @@ -2,14 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ArraySchema, CodeModel, DictionarySchema, getAllProperties, HttpHeader, ObjectSchema, Property, Schema, SchemaType } from '@azure-tools/codemodel'; +import { ArraySchema, CodeModel, DictionarySchema, getAllProperties, HttpHeader, ObjectSchema, Property, Schema, SchemaType } from '@autorest/codemodel'; import { serialize } from '@azure-tools/codegen'; import { PwshModel } from '../utils/PwshModel'; import { ModelState } from '../utils/model-state'; import { StatusCodes } from '../utils/http-definitions'; import { items, values, keys, Dictionary, length } from '@azure-tools/linq'; -import { Host } from '@azure-tools/autorest-extension-base'; +import { Host } from '@autorest/extension-base'; type State = ModelState; diff --git a/powershell/plugins/plugin-tweak-model-azure-v2.ts b/powershell/plugins/plugin-tweak-model-azure-v2.ts index 50f2ab18828..4855fa9a07b 100644 --- a/powershell/plugins/plugin-tweak-model-azure-v2.ts +++ b/powershell/plugins/plugin-tweak-model-azure-v2.ts @@ -6,10 +6,10 @@ import { keys, length, values } from '@azure-tools/linq'; -import { Channel, Host } from '@azure-tools/autorest-extension-base'; +import { Channel, Host } from '@autorest/extension-base'; import { ModelState } from '../utils/model-state'; import { PwshModel } from '../utils/PwshModel'; -import { getAllProperties, ObjectSchema, Response, SchemaType, Schema } from '@azure-tools/codemodel'; +import { getAllProperties, ObjectSchema, Response, SchemaType, Schema } from '@autorest/codemodel'; import { serialize } from '@azure-tools/codegen'; type State = ModelState; diff --git a/powershell/plugins/plugin-tweak-model.ts b/powershell/plugins/plugin-tweak-model.ts index 64af3271f59..16c1c52f163 100644 --- a/powershell/plugins/plugin-tweak-model.ts +++ b/powershell/plugins/plugin-tweak-model.ts @@ -2,13 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Property, SealedChoiceSchema, codeModelSchema, CodeModel, StringSchema, ObjectSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, VirtualParameter, getAllProperties, ImplementationLocation, OperationGroup, Request, SchemaContext, ChoiceSchema, Scheme, Schema, ConstantSchema, ConditionalValue } from '@azure-tools/codemodel'; +import { Property, SealedChoiceSchema, codeModelSchema, CodeModel, StringSchema, ObjectSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, VirtualParameter, getAllProperties, ImplementationLocation, OperationGroup, Request, SchemaContext, ChoiceSchema, Schema, ConstantSchema, ConditionalValue } from '@autorest/codemodel'; import { pascalCase, deconstruct, fixLeadingNumber, serialize, KnownMediaType } from '@azure-tools/codegen'; import { items, keys, values, Dictionary, length } from '@azure-tools/linq'; import { PwshModel } from '../utils/PwshModel'; import { ModelState } from '../utils/model-state'; -import { Channel, Host, Session, startSession } from '@azure-tools/autorest-extension-base'; +import { Channel, Host, Session, startSession } from '@autorest/extension-base'; import { defaultCipherList } from 'constants'; import { String } from '../llcsharp/schema/string'; import { JsonType } from '../utils/schema'; diff --git a/powershell/plugins/powershell-v2.ts b/powershell/plugins/powershell-v2.ts index ed5744b2d9b..78ba6471fce 100644 --- a/powershell/plugins/powershell-v2.ts +++ b/powershell/plugins/powershell-v2.ts @@ -5,7 +5,7 @@ //import { codemodel } from '@azure-tools/codemodel-v3'; import { deserialize, applyOverrides, copyResources, copyBinaryResources, safeEval } from '@azure-tools/codegen'; -import { Host } from '@azure-tools/autorest-extension-base'; +import { Host } from '@autorest/extension-base'; import { join } from 'path'; import { Project } from '../internal/project'; import { generatePsm1 } from '../generators/psm1'; diff --git a/powershell/plugins/ps-namer-v2.ts b/powershell/plugins/ps-namer-v2.ts index 3a1e957a67a..57d32484b2e 100644 --- a/powershell/plugins/ps-namer-v2.ts +++ b/powershell/plugins/ps-namer-v2.ts @@ -3,8 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { codeModelSchema, CodeModel, Schema, ObjectSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, getAllProperties, ImplementationLocation, OperationGroup, Request, SchemaContext } from '@azure-tools/codemodel'; -import { Host, Channel, Session, startSession } from '@azure-tools/autorest-extension-base'; +import { codeModelSchema, CodeModel, Schema, ObjectSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, getAllProperties, ImplementationLocation, OperationGroup, Request, SchemaContext } from '@autorest/codemodel'; +import { Host, Channel, Session, startSession } from '@autorest/extension-base'; //import { allVirtualParameters, allVirtualProperties, resolveParameterNames, resolvePropertyNames } from '@azure-tools/codemodel-v3'; import { deconstruct, removeProhibitedPrefix, removeSequentialDuplicates, pascalCase, serialize } from '@azure-tools/codegen'; import { items, values, keys, Dictionary, length } from '@azure-tools/linq'; diff --git a/powershell/test/operationId-inferring.ts b/powershell/test/operationId-inferring.ts index 27d35348c08..5b133e4d658 100644 --- a/powershell/test/operationId-inferring.ts +++ b/powershell/test/operationId-inferring.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import { suite, test } from 'mocha-typescript'; import * as pp from '../plugins/create-commands-v2'; -import { Channel, JsonPath, Mapping, RawSourceMap, Message } from '@azure-tools/autorest-extension-base'; +import { Channel, JsonPath, Mapping, RawSourceMap, Message } from '@autorest/extension-base'; import { items, values, keys, Dictionary, length } from '@azure-tools/linq'; require('source-map-support').install(); diff --git a/powershell/utils/PwshModel.ts b/powershell/utils/PwshModel.ts index acacaaa7d0f..5ac72c9c0d6 100644 --- a/powershell/utils/PwshModel.ts +++ b/powershell/utils/PwshModel.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { codeModelSchema, CodeModel, Schema, ObjectSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, VirtualParameter, getAllProperties, ImplementationLocation, OperationGroup, Request, SchemaContext } from '@azure-tools/codemodel'; +import { codeModelSchema, CodeModel, Schema, ObjectSchema, GroupSchema, isObjectSchema, SchemaType, GroupProperty, ParameterLocation, Operation, Parameter, VirtualParameter, getAllProperties, ImplementationLocation, OperationGroup, Request, SchemaContext } from '@autorest/codemodel'; import { DeepPartial } from '@azure-tools/codegen'; import { CommandComponents } from '../utils/command-operation'; diff --git a/powershell/utils/command-operation.ts b/powershell/utils/command-operation.ts index 4ac804139cd..a803d70d9bb 100644 --- a/powershell/utils/command-operation.ts +++ b/powershell/utils/command-operation.ts @@ -7,9 +7,9 @@ import { Components, IParameter, LanguageDetails } from './components'; import { Extensions } from './extensions'; import { ProgramaticOperationDetails, ProgrammaticOperation } from './programatic-operation'; import { VirtualProperty } from './schema'; -import { Schema } from '@azure-tools/codemodel'; +import { Schema } from '@autorest/codemodel'; import { DeepPartial } from '@azure-tools/codegen'; -import { Operation } from '@azure-tools/codemodel'; +import { Operation } from '@autorest/codemodel'; import { uid } from './uid'; import { Dictionary } from '@azure-tools/linq'; diff --git a/powershell/utils/components.ts b/powershell/utils/components.ts index 81b6a5b3f7c..2d0449674b4 100644 --- a/powershell/utils/components.ts +++ b/powershell/utils/components.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { DeepPartial } from '@azure-tools/codegen'; import { Dictionary } from '@azure-tools/linq'; -import { Schema } from '@azure-tools/codemodel'; +import { Schema } from '@autorest/codemodel'; import { Extensions } from './extensions'; //import { Schema } from './schema'; import { uid } from './uid'; diff --git a/powershell/utils/model-state.ts b/powershell/utils/model-state.ts index d809d798f1b..9420cb08875 100644 --- a/powershell/utils/model-state.ts +++ b/powershell/utils/model-state.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Channel, Host, JsonPath, Mapping, RawSourceMap, Message } from '@azure-tools/autorest-extension-base'; +import { Channel, Host, JsonPath, Mapping, RawSourceMap, Message } from '@autorest/extension-base'; import { safeEval, deserialize, Initializer, DeepPartial } from '@azure-tools/codegen'; import { Dictionary } from '@azure-tools/linq'; diff --git a/powershell/utils/programatic-operation.ts b/powershell/utils/programatic-operation.ts index 98c8fe7ede1..b7851b125b5 100644 --- a/powershell/utils/programatic-operation.ts +++ b/powershell/utils/programatic-operation.ts @@ -6,7 +6,7 @@ import { ImplementationDetails, IOperation, IParameter, LanguageDetails } from './components'; import { Extensions } from './extensions'; //import { Schema } from './schema'; -import { Schema } from '@azure-tools/codemodel'; +import { Schema } from '@autorest/codemodel'; import { Dictionary } from '@azure-tools/linq'; import { uid } from './uid'; import { DeepPartial } from '@azure-tools/codegen'; diff --git a/powershell/utils/schema.ts b/powershell/utils/schema.ts index 8f4fcc56936..3aba491f0b6 100644 --- a/powershell/utils/schema.ts +++ b/powershell/utils/schema.ts @@ -8,7 +8,7 @@ import { Extensions } from './extensions'; import { DeepPartial, } from '@azure-tools/codegen'; import { Dictionary, values } from '@azure-tools/linq'; import { uid } from './uid'; -import { Schema, ObjectSchema, Property, SchemaType, isObjectSchema } from '@azure-tools/codemodel'; +import { Schema, ObjectSchema, Property, SchemaType, isObjectSchema } from '@autorest/codemodel'; import { EnhancedTypeDeclaration } from '../llcsharp/schema/extended-type-declaration'; import { ModelClass } from '../llcsharp/model/model-class'; import { ModelInterface } from '../llcsharp/model/interface';