Skip to content

Fix the issue nested object is not supported #646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 3, 2020
Merged

Fix the issue nested object is not supported #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c117d09
Fix the issue nested ojbect not supported
dolauli Jul 30, 2020
4a7d6bd
Add more passed test cases
dolauli Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion powershell/plugins/plugin-create-inline-properties.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ function createVirtualProperties(schema: ObjectSchema, stack: Array<string>, thr
property: inlinedProperty.property,
private: inlinedProperty.private,
nameComponents: components,
nameOptions: getNameOptions(inlinedProperty.property.schema.details.default.name, components),
nameOptions: getNameOptions(inlinedProperty.property.schema.language.default.name, components),
accessViaProperty: privateProperty,
accessViaMember: inlinedProperty,
accessViaSchema: schema,
Expand Down
4 changes: 2 additions & 2 deletions powershell/utils/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } from '@azure-tools/codemodel';
import { Schema, ObjectSchema, Property, SchemaType, isObjectSchema } from '@azure-tools/codemodel';
import { NewEnhancedTypeDeclaration } from '../llcsharp/schema/extended-type-declaration';
import { NewModelClass } from '../llcsharp/model/model-class';
import { NewModelInterface } from '../llcsharp/model/interface';
Expand Down Expand Up @@ -138,7 +138,7 @@ export function getPolymorphicBases(schema: Schema): Array<Schema> {
}

export function getAllProperties(schema: Schema): Array<Property> {
if (schema instanceof ObjectSchema) {
if (isObjectSchema(schema)) {
return [...values(schema.parents ? schema.parents.immediate : []).selectMany(getAllProperties), ...values(schema.properties)];
} else {
return [];
Expand Down
9 changes: 6 additions & 3 deletions tests-upgrade/Configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@
"basic-response-multioperation",
"basic-spec-required",
"basic-spec-root",
"datamodels-datatypes-array",
"component-param",
"component-definitions-local",
"component-multiparam",
"component-param",
"component-param-inbody",
"component-param-localremote",
"component-param-inbody"
"component-param-remote",
"datamodels-datatypes-array",
"datamodels-datatypes-integer"
],
"BlackList": [
"basic-get-querystr",
Expand Down