Skip to content

Commit 6680f99

Browse files
committed
fix(comms): refactor wsdl generation to use minOccurs
* refactors the wsdl->ts generation utility to respect the "minOccurs" properties in WSDL definitions * removes the Partial<...> wrapper for requests in generated functions * exposes an optional "abortSignal" param to all service endpoints, so that consumers can define their own AbortSignals and they be passed thru to ESPConnection.send(...) * tightens up several instances of looser typing * regenerated services based upon these changes * corrected the url for the wsdl-esdlconfig and wsdl-resources tasks in package.json Signed-off-by: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
1 parent 5eae9ca commit 6680f99

File tree

20 files changed

+7114
-1644
lines changed

20 files changed

+7114
-1644
lines changed

packages/comms/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@
5959
"wsdl-dfu": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsDfu?wsdl --outDir=./src/services/wsdl",
6060
"wsdl-dfuxref": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsDFUXRef?wsdl --outDir=./src/services/wsdl",
6161
"wsdl-elk": "node ./lib-esm/index.js -k --url=http://localhost:8010/ws_elk?wsdl --outDir=./src/services/wsdl",
62-
"wsdl-esdlconfig": "node ./lib-esm/index.js -k --url=http://localhost:8010/ws_esdlconfig?wsdl --outDir=./src/services/wsdl",
62+
"wsdl-esdlconfig": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsEsdlconfig?wsdl --outDir=./src/services/wsdl",
6363
"wsdl-fileio": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsFileIO?wsdl --outDir=./src/services/wsdl",
6464
"wsdl-filespray": "node ./lib-esm/index.js -k --url=http://localhost:8010/FileSpray?wsdl --outDir=./src/services/wsdl",
6565
"wsdl-logaccess": "node ./lib-esm/index.js -k --url=http://localhost:8010/ws_logaccess?wsdl --outDir=./src/services/wsdl",
6666
"wsdl-machine": "node ./lib-esm/index.js -k --url=http://localhost:8010/ws_machine?wsdl --outDir=./src/services/wsdl",
6767
"wsdl-packageprocess": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsPackageProcess?wsdl --outDir=./src/services/wsdl",
6868
"wsdl-sasha": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsSasha?wsdl --outDir=./src/services/wsdl",
6969
"wsdl-smc": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsSMC?wsdl --outDir=./src/services/wsdl",
70-
"wsdl-resources": "node ./lib-esm/index.js -k --url=http://localhost:8010/ws_resources?wsdl --outDir=./src/services/wsdl",
70+
"wsdl-resources": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsResources?wsdl --outDir=./src/services/wsdl",
7171
"wsdl-store": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsStore?wsdl --outDir=./src/services/wsdl",
7272
"wsdl-topology": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsTopology?wsdl --outDir=./src/services/wsdl",
7373
"wsdl-workunits": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsWorkunits?wsdl --outDir=./src/services/wsdl",
@@ -110,4 +110,4 @@
110110
"esp",
111111
"HPCC-Platform"
112112
]
113-
}
113+
}

packages/comms/src/services/wsPackageProcess.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { PackageProcessServiceBase, WsPackageProcess } from "./wsdl/WsPackageProcess/v1.07/WsPackageProcess.ts";
1+
import { PackageProcessServiceBase, WsPackageProcess } from "./wsdl/WsPackageProcess/v1.08/WsPackageProcess.ts";
22

33
export {
44
type WsPackageProcess

packages/comms/src/services/wsWorkunits.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { deepMixin, xml2json, XMLNode } from "@hpcc-js/util";
2-
import { WsWorkunits, WorkunitsServiceBase } from "./wsdl/WsWorkunits/v2.04/WsWorkunits.ts";
2+
import { WsWorkunits, WorkunitsServiceBase } from "./wsdl/WsWorkunits/v2.05/WsWorkunits.ts";
33
import { IConnection, IOptions } from "../connection.ts";
44

55
export {

0 commit comments

Comments
 (0)