Comparing version 0.11.4 to 0.12.0
@@ -0,1 +1,6 @@ | ||
0.12.0 / 2016-02-02 | ||
================= | ||
* [MAINTENANCE] updating lodash to 3.x.x | ||
* [FIX] Schema overwrite when include a xsd with <xsd:include> (#788) | ||
0.11.4 / 2016-01-09 | ||
@@ -2,0 +7,0 @@ ================= |
@@ -347,2 +347,14 @@ /* | ||
SchemaElement.prototype.merge = function(source) { | ||
assert(source instanceof SchemaElement); | ||
if (this.$targetNamespace === source.$targetNamespace) { | ||
_.merge(this.complexTypes, source.complexTypes); | ||
_.merge(this.types, source.types); | ||
_.merge(this.elements, source.elements); | ||
_.merge(this.xmlns, source.xmlns); | ||
} | ||
return this; | ||
}; | ||
SchemaElement.prototype.addChild = function(child) { | ||
@@ -378,8 +390,2 @@ if (child.$name in Primitives) | ||
if(!targetNamespace) { | ||
if(child.includes && (child.includes instanceof Array) && child.includes.length > 0) { | ||
targetNamespace = child.includes[0].namespace; | ||
} | ||
} | ||
if(!this.schemas.hasOwnProperty(targetNamespace)) { | ||
@@ -1149,3 +1155,5 @@ this.schemas[targetNamespace] = child; | ||
if(wsdl.definitions instanceof DefinitionsElement){ | ||
_.merge(self.definitions, wsdl.definitions); | ||
_.merge(self.definitions, wsdl.definitions, function(a,b) { | ||
return (a instanceof SchemaElement) ? a.merge(b) : undefined; | ||
}); | ||
}else{ | ||
@@ -1152,0 +1160,0 @@ self.definitions.schemas[include.namespace || wsdl.definitions.$targetNamespace] = deepMerge(self.definitions.schemas[include.namespace || wsdl.definitions.$targetNamespace], wsdl.definitions); |
{ | ||
"name": "soap", | ||
"version": "0.11.4", | ||
"version": "0.12.0", | ||
"description": "A minimal node SOAP client", | ||
@@ -11,3 +11,3 @@ "engines": { | ||
"debug": "~0.7.4", | ||
"lodash": "~2.4.1", | ||
"lodash": "3.x.x", | ||
"request": ">=2.9.0", | ||
@@ -14,0 +14,0 @@ "sax": ">=0.6", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
851172
3576
+ Addedlodash@3.10.1(transitive)
- Removedlodash@2.4.2(transitive)
Updatedlodash@3.x.x