@techspokes/typescript-wsdl-client 0.2.6 → 0.2.71
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaCompiler.d.ts","sourceRoot":"","sources":["../../src/compiler/schemaCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"schemaCompiler.d.ts","sourceRoot":"","sources":["../../src/compiler/schemaCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAIzD,MAAM,MAAM,KAAK,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAElD,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,KAAK,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;QAC9B,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC,CAAC;IACH,KAAK,EAAE,KAAK,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;QAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC,CAAC;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;QAC9B,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC,CAAC;IAEH,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC;QAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC,CAAC;CACJ,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,IAAI,EAAE;QACJ,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACnC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAClD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;KAC/C,CAAC;IACF,UAAU,EAAE,KAAK,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,YAAY,CAAC,EAAE,KAAK,CAAC;QACrB,aAAa,CAAC,EAAE,KAAK,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC,CAAC;IACH,YAAY,EAAE,MAAM,CAAC;IAErB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA6DF;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,eAAe,GAAG,eAAe,CAmhBxF"}
|
|
@@ -387,7 +387,7 @@ export function compileCatalog(cat, _opts) {
|
|
|
387
387
|
const tAttr = enode["@_type"];
|
|
388
388
|
if (tAttr) {
|
|
389
389
|
const q = resolveQName(tAttr, schemaNS, prefixes);
|
|
390
|
-
// If references a simple type → $value; if complex type →
|
|
390
|
+
// If references a simple type → $value; if complex type → prefer alias to avoid duplication
|
|
391
391
|
if (q.ns === XS) {
|
|
392
392
|
const label = `xs:${q.local}`;
|
|
393
393
|
const t = {
|
|
@@ -401,10 +401,23 @@ export function compileCatalog(cat, _opts) {
|
|
|
401
401
|
}
|
|
402
402
|
const baseRec = complexTypes.get(qkey(q));
|
|
403
403
|
if (baseRec) {
|
|
404
|
+
// Ensure base type is compiled
|
|
404
405
|
const base = getOrCompileComplex(baseRec.node["@_name"], baseRec.node, baseRec.tns, baseRec.prefixes);
|
|
405
|
-
|
|
406
|
-
compiledMap.
|
|
407
|
-
|
|
406
|
+
// If a concrete type with the same name already exists, avoid aliasing conflict
|
|
407
|
+
if (!compiledMap.has(key)) {
|
|
408
|
+
// record alias: ElementName -> BaseTypeName
|
|
409
|
+
const aliasKey = key;
|
|
410
|
+
const existingAlias = aliasMap.get(aliasKey);
|
|
411
|
+
const declared = `{${base.ns}}${base.name}`;
|
|
412
|
+
if (!existingAlias) {
|
|
413
|
+
aliasMap.set(aliasKey, { name: outName, ns: schemaNS, tsType: base.name, declared });
|
|
414
|
+
}
|
|
415
|
+
else {
|
|
416
|
+
// if an alias exists but points elsewhere, keep the first one (stable) and ignore
|
|
417
|
+
}
|
|
418
|
+
}
|
|
419
|
+
// Return base so callers have a CompiledType, but do not duplicate in compiledMap for wrapper
|
|
420
|
+
return base;
|
|
408
421
|
}
|
|
409
422
|
const srec = simpleTypes.get(qkey(q));
|
|
410
423
|
if (srec) {
|
|
@@ -459,6 +472,17 @@ export function compileCatalog(cat, _opts) {
|
|
|
459
472
|
childType[t.name] = child;
|
|
460
473
|
propMeta[t.name] = meta;
|
|
461
474
|
}
|
|
475
|
+
// Add meta synonyms for element aliases that point to complex types, so runtime can use either name
|
|
476
|
+
if (aliasList.length) {
|
|
477
|
+
const typeNameSet = new Set(typesList.map(t => t.name));
|
|
478
|
+
for (const a of aliasList) {
|
|
479
|
+
if (typeNameSet.has(a.tsType) && !(a.name in childType)) {
|
|
480
|
+
childType[a.name] = childType[a.tsType];
|
|
481
|
+
propMeta[a.name] = propMeta[a.tsType];
|
|
482
|
+
attrSpec[a.name] = attrSpec[a.tsType];
|
|
483
|
+
}
|
|
484
|
+
}
|
|
485
|
+
}
|
|
462
486
|
// operations / soapAction (enriched)
|
|
463
487
|
// 1) Gather all binding definitions and select the SOAP binding (soap:binding or soap12:binding child).
|
|
464
488
|
// 2) Use the binding's @type to locate the matching portType in definitions.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@techspokes/typescript-wsdl-client",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.71",
|
|
4
4
|
"description": "TypeScript WSDL → SOAP client generator with full xs:attribute support, complex types, sequences, inheritance, and namespace-collision merging.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"wsdl",
|