Skip to content
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

Jump to bottom

typeStorageを確実に参照するようにする #1230

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

typeStorageを確実に参照するようにする #1230

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion src/wsdl/elements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,22 @@ export class ElementElement extends Element {
let type: any = this.$type || this.$ref;
if (type) {
type = splitQName(type);
const typeStorage = this.$type ? definitions.descriptions.types : definitions.descriptions.elements;
const typeName: string = type.name;
if(typeName in typeStorage){// typeにtypeNameが入ってしまった場合の対応、本来はこのようなことが起きないように対処すべきかもしれない。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"// typeName in type, perhaps this should be handled to prevent this from happening in the first place."

if (this.$ref) {
element = typeStorage[typeName];
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably, need to check that typeStorage[typeName] has a value, could be undefined, null ... anything

}
else {
element[name] = typeStorage[typeName];
}
return element;
}
const ns: string = xmlns && xmlns[type.prefix] ||
((definitions.xmlns[type.prefix] !== undefined || definitions.xmlns[this.targetNSAlias] !== undefined) && this.schemaXmlns[type.prefix]) ||
definitions.xmlns[type.prefix];
const schema = definitions.schemas[ns];
const typeElement = schema && (this.$type ? schema.complexTypes[typeName] || schema.types[typeName] : schema.elements[typeName]);
const typeStorage = this.$type ? definitions.descriptions.types : definitions.descriptions.elements;

if (ns && definitions.schemas[ns]) {
xmlns = definitions.schemas[ns].xmlns;
Expand Down