Fixed some issues with xsd elements (#1057)

* Fixed some issues with xsd elements * Made the fix more specific to the particular usecase * Added a test for aliased namespaces
vpulim · Apr 12, 2019 · 630d80d · 630d80d
1 parent 33e170e
commit 630d80d
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 2 deletions.
diff --git a/src/wsdl/elements.ts b/src/wsdl/elements.ts
@@ -210,7 +210,7 @@ export class ElementElement extends Element {
       type = splitQName(type);
       const typeName: string = type.name;
       const ns: string = xmlns && xmlns[type.prefix] ||
-          (definitions.xmlns[type.prefix] !== undefined && this.schemaXmlns[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] );
@@ -408,7 +408,7 @@ export class ExtensionElement extends Element {
 
         if (typeElement) {
           const base = typeElement.description(definitions, schema.xmlns);
-          desc = _.defaultsDeep(base, desc);
+          desc = typeof base === 'string' ? base : _.defaultsDeep(base, desc);
         }
       }
     }

diff --git a/...st-response-samples/Dummy__should_work_with_imported_schemas_that_have_aliases/common.xsd b/...st-response-samples/Dummy__should_work_with_imported_schemas_that_have_aliases/common.xsd
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:tns="http://www.Dummy.com/Common/Types" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.Dummy.com/Common/Types" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:complexType name="DummyResult">
+		<xs:sequence>
+			<xs:element name="DummyList" type="tns:DummyList" minOccurs="0"/>
+		</xs:sequence>
+		<xs:attribute name="code" type="xs:string" use="optional"/>
+	</xs:complexType>
+	<xs:complexType name="Dummy">
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+				<xs:attribute name="language" type="xs:language" use="optional"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	<xs:complexType name="DummyList">
+		<xs:sequence>
+			<xs:element name="DummyElement" type="tns:Dummy" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>
+    <xs:complexType name="DummyFilter">
+        <xs:sequence>
+            <xs:element name="DummyIntFilter" type="xs:string" minOccurs="0"/>
+            <xs:element name="DummyStringFilter" type="xs:string" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+</xs:schema>
+
diff --git a/...uest-response-samples/Dummy__should_work_with_imported_schemas_that_have_aliases/name.xsd b/...uest-response-samples/Dummy__should_work_with_imported_schemas_that_have_aliases/name.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:c="http://www.Dummy.com/Common/Types" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:me="http://www.Dummy.com/Name/Types" targetNamespace="http://www.Dummy.com/Name/Types" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:import namespace="common.xsd" schemaLocation="common.xsd"/>
+        <xs:element name="DummyRequest" type="me:requestType"/>
+        <xs:element name="DummyResponse" type="me:responseType"/>
+	<xs:element name="requestType">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="DummyField1" type="xs:string" minOccurs="0"/>
+				<xs:element name="DummyFilter" type="c:DummyFilter" minOccurs="0"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="responseType">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="DummyResult" type="c:DummyResult"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/...-response-samples/Dummy__should_work_with_imported_schemas_that_have_aliases/request.json b/...-response-samples/Dummy__should_work_with_imported_schemas_that_have_aliases/request.json
@@ -0,0 +1,6 @@
+{
+  "DummyField1": "Humpty",
+  "DummyFilter": {
+    "DummyStringFilter": "Dumpty"
+  }
+}
diff --git a/...t-response-samples/Dummy__should_work_with_imported_schemas_that_have_aliases/request.xml b/...t-response-samples/Dummy__should_work_with_imported_schemas_that_have_aliases/request.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://www.Dummy.com" xmlns:n="http://www.Dummy.com/Name/Types"><soap:Body><n:DummyRequest xmlns:n="http://www.Dummy.com/Name/Types" xmlns="http://www.Dummy.com/Name/Types"><n:DummyField1>Humpty</n:DummyField1><n:DummyFilter><c:DummyStringFilter xmlns:c="http://www.Dummy.com/Common/Types">Dumpty</c:DummyStringFilter></n:DummyFilter></n:DummyRequest></soap:Body></soap:Envelope>
diff --git a/...est-response-samples/Dummy__should_work_with_imported_schemas_that_have_aliases/soap.wsdl b/...est-response-samples/Dummy__should_work_with_imported_schemas_that_have_aliases/soap.wsdl
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+xmlns:tns="http://www.Dummy.com"  xmlns:n="http://www.Dummy.com/Name/Types"  xmlns:ns="http://schemas.xmlsoap.org/soap/encoding/" targetNamespace="http://www.Dummy.com">
+	<wsdl:types>
+		<xs:schema>
+			<xs:import namespace="http://www.Dummy.com/Common/Types" schemaLocation="common.xsd"/>
+			<xs:import namespace="http://www.Dummy.com/Name/Types" schemaLocation="name.xsd"/>
+		</xs:schema>
+	</wsdl:types>
+	<wsdl:message name="DummyRequest">
+		<wsdl:part name="DummyRequest" element="n:DummyRequest"/>
+	</wsdl:message>
+	<wsdl:message name="DummyResponse">
+		<wsdl:part name="DummyResponse" element="n:DummyResponse"/>
+	</wsdl:message>
+	<wsdl:portType name="DummyPortType">
+		<wsdl:operation name="Dummy">
+			<wsdl:input message="tns:DummyRequest"/>
+			<wsdl:output message="tns:DummyResponse"/>
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name="DummyBinding" type="tns:DummyPortType">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<wsdl:operation name="Dummy">
+			<soap:operation soapAction="http://www.Dummy.com#Dummy" style="document"/>
+			<wsdl:input>
+				<soap:body use="literal"/>
+			</wsdl:input>
+			<wsdl:output>
+				<soap:body use="literal"/>
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+	<wsdl:service name="DummyService">
+		<wsdl:port name="DummyPortType" binding="tns:DummyBinding">
+			<soap:address location="http://www.Dummy.com/"/>
+		</wsdl:port>
+	</wsdl:service>
+</wsdl:definitions>
+