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

Fix issue with self recursive WSDL types #39

Merged
merged 1 commit into from
Apr 16, 2022
Merged

Fix issue with self recursive WSDL types #39

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion src/generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,10 @@ function generateDefinitionFile(
// Wasn't generated yet
generateDefinitionFile(project, prop.ref, defDir, [...stack, prop.ref.name], generated);
}
addSafeImport(definitionImports, `./${prop.ref.name}`, prop.ref.name);
// If a property is of the same type as its parent type, don't add import
if(prop.ref.name !== definition.name) {
addSafeImport(definitionImports, `./${prop.ref.name}`, prop.ref.name);
}
definitionProperties.push(createProperty(prop.name, prop.ref.name, prop.sourceName, prop.isArray));
}
}
Expand Down
26 changes: 26 additions & 0 deletions test/node-soap/self_recursive.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import test from "tape";
import { existsSync } from "fs";
import { parseAndGenerate } from "../../src";
import { Logger } from "../../src/utils/logger";

const target = "self_recursive";

test(target, async t => {
Logger.disabled();

const input = `./test/resources/${target}.wsdl`;
const outdir = "./test/generated";

t.test(`${target} - generate wsdl client`, async t => {
await parseAndGenerate(input, outdir);
t.end();
});

t.test(`${target} - check definitions`, async t => {
t.equal(existsSync(`${outdir}/selfrecursive/definitions/GetPerson.ts`), true);
t.equal(existsSync(`${outdir}/selfrecursive/definitions/GetPersonResponse.ts`), true);
t.equal(existsSync(`${outdir}/selfrecursive/definitions/Person.ts`), true);
t.equal(existsSync(`${outdir}/selfrecursive/definitions/Request.ts`), true);
t.end();
});
});
86 changes: 86 additions & 0 deletions test/resources/self_recursive.wsdl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<wsdl:definitions
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:tns="http://recursive.com/account"
xmlns:s="http://www.w3.org/2001/XMLSchema"
xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
targetNamespace="http://recursive.com/account"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
<s:schema elementFormDefault="qualified" targetNamespace="http://recursive.com/account">
<s:element name="GetPerson">
<s:complexType>
<s:sequence>
<s:element minOccurs="0" maxOccurs="1" name="Request" type="tns:GetPersonRequest" />
</s:sequence>
</s:complexType>
</s:element>
<s:complexType name="GetPersonRequest">
<s:sequence>
<s:element minOccurs="1" maxOccurs="1" name="PersonId" type="s:int" />
</s:sequence>
</s:complexType>
<s:complexType name="AccountAttribute">
<s:sequence>
<s:element minOccurs="1" maxOccurs="1" name="AttributeId" type="s:int" />
<s:element minOccurs="0" maxOccurs="1" name="AttributeUid" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="ProductAttributeUid" type="s:string" />
<s:element minOccurs="1" maxOccurs="1" name="IsTemplateAttribute" type="s:int" />
<s:element minOccurs="0" maxOccurs="1" name="TemplateInternalName" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Name" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="Status" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="DisplayStatus" type="s:string" />
<s:element minOccurs="1" maxOccurs="1" name="ReadOnly" type="s:int" />
<s:element minOccurs="1" maxOccurs="1" name="CanBeModified" type="s:int" />
<s:element minOccurs="0" maxOccurs="1" name="AccountElements" type="tns:ArrayOfAccountElement" />
</s:sequence>
</s:complexType>
<s:element name="GetPersonResponse">
<s:complexType>
<s:sequence>
<s:element minOccurs="1" maxOccurs="1" name="Person" type="tns:PersonResponse" />
</s:sequence>
</s:complexType>
</s:element>
<s:complexType name="PersonResponse">
<s:sequence>
<s:element minOccurs="1" maxOccurs="1" name="Id" type="s:int" />
<s:element minOccurs="1" maxOccurs="1" name="Name" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="mother" type="tns:PersonResponse" />
<s:element minOccurs="0" maxOccurs="1" name="father" type="tns:PersonResponse" />
</s:sequence>
</s:complexType>
</s:schema>
</wsdl:types>
<wsdl:message name="GetPersonSoapIn">
<wsdl:part name="parameters" element="tns:GetPerson" />
</wsdl:message>
<wsdl:message name="GetPersonSoapOut">
<wsdl:part name="parameters" element="tns:GetPersonResponse" />
</wsdl:message>
<wsdl:portType name="RecursiveOperationsSoap">
<wsdl:operation name="GetPerson">
<wsdl:input message="tns:GetPersonSoapIn" />
<wsdl:output message="tns:GetPersonSoapOut" />
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="RecursiveOperationsSoap" type="tns:RecursiveOperationsSoap">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
<wsdl:operation name="GetPerson">
<soap:operation soapAction="http://recursive.com/account/GetPerson" style="document" />
<wsdl:input>
<soap:body use="literal" />
<soap:header message="tns:GetPersonSecureHeader" part="SecureHeader" use="literal" />
</wsdl:input>
<wsdl:output>
<soap:body use="literal" />
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="RecursiveOperations">
<documentation xmlns="http://schemas.xmlsoap.org/wsdl/" />
<wsdl:port name="RecursiveOperationsSoap" binding="tns:RecursiveOperationsSoap">
<soap:address location="http://recursive.com/Account/RecursiveOperations.asmx" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>