@hpcc-js/comms 2.98.0 → 3.1.0

package/package.json

@@ -1,88 +1,83 @@
 {
     "name": "@hpcc-js/comms",
-    "version": "2.98.0",
+    "version": "3.1.0",
     "description": "hpcc-js - Communications",
-    "main": "dist/index.node.js",
-    "module": "dist/index.es6",
-    "module-node": "dist/index.node.es6",
-    "browser": "dist/index.js",
-    "unpkg": "dist/index.min.js",
-    "jsdelivr": "dist/index.min.js",
-    "types": "types/index.node.d.ts",
+    "type": "module",
+    "exports": {
+        ".": {
+            "types": "./types/index.node.d.ts",
+            "node": "./dist/index.node.js",
+            "default": "./dist/index.js"
+        }
+    },
+    "module": "./dist/index.node.js",
+    "browser": "./dist/index.js",
+    "types": "./types/index.node.d.ts",
     "files": [
-        "types/*",
-        "types-3.4/*",
-        "lib-es6/*",
+        "dist/*",
         "src/*",
-        "dist/*"
+        "types/*"
     ],
     "scripts": {
-        "clean": "rimraf --glob lib* types dist *.tsbuildinfo",
-        "compile-es6": "tsc --module es6 --outDir ./lib-es6",
-        "compile-es6-watch": "npm run compile-es6 -- -w",
-        "compile-umd": "tsc --module umd --outDir ./lib-umd",
-        "compile-umd-watch": "npm run compile-umd -- -w",
-        "compile-util": "tsc --esModuleInterop --target es2019 --skipLibCheck --module commonjs --sourcemap --outDir ./lib-cjs ./utils/index.ts",
-        "compile-util-watch": "npm run compile-util -- -w",
-        "bundle": "rollup -c",
-        "bundle-watch": "npm run bundle -- -w",
-        "minimize-browser": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js",
-        "minimize-node": "terser dist/index.node.js -c -m --source-map \"content='dist/index.node.js.map',url='index.node.min.js.map'\" -o dist/index.node.min.js",
-        "minimize": "npm run minimize-browser && npm run minimize-node",
-        "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
-        "build": "npm run compile-es6 && npm run bundle",
-        "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
+        "clean": "rimraf --glob lib* types dist *.tsbuildinfo .turbo",
+        "bundle": "node esbuild.js",
+        "bundle-watch": "npm run bundle -- --development --watch",
+        "gen-types": "tsc --project tsconfig.json",
+        "gen-types-watch": "npm run gen-types -- --watch",
+        "build": "run-p gen-types bundle",
         "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "lint-fix": "eslint --fix src/**/*.ts",
-        "test": "mocha lib-umd/__tests__ --reporter spec",
         "docs": "typedoc --options tdoptions.json .",
-        "update": "npx --yes npm-check-updates -u -t minor",
-        "wsdl-access": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_access?wsdl --outDir=./src/services/wsdl",
-        "wsdl-account": "node ./lib-cjs/index.js -k --url=http://localhost:8010/Ws_Account?wsdl --outDir=./src/services/wsdl",
-        "wsdl-cloud": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsCloud?wsdl --outDir=./src/services/wsdl",
-        "wsdl-codesign": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_codesign?wsdl --outDir=./src/services/wsdl",
-        "wsdl-dali": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsDali?wsdl --outDir=./src/services/wsdl",
-        "wsdl-dfu": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsDfu?wsdl --outDir=./src/services/wsdl",
-        "wsdl-dfuxref": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsDFUXRef?wsdl --outDir=./src/services/wsdl",
-        "wsdl-elk": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_elk?wsdl --outDir=./src/services/wsdl",
-        "wsdl-esdlconfig": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_esdlconfig?wsdl --outDir=./src/services/wsdl",
-        "wsdl-fileio": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsFileIO?wsdl --outDir=./src/services/wsdl",
-        "wsdl-filespray": "node ./lib-cjs/index.js -k --url=http://localhost:8010/FileSpray?wsdl --outDir=./src/services/wsdl",
-        "wsdl-logaccess": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_logaccess?wsdl --outDir=./src/services/wsdl",
-        "wsdl-machine": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_machine?wsdl --outDir=./src/services/wsdl",
-        "wsdl-packageprocess": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsPackageProcess?wsdl --outDir=./src/services/wsdl",
-        "wsdl-sasha": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsSasha?wsdl --outDir=./src/services/wsdl",
-        "wsdl-smc": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsSMC?wsdl --outDir=./src/services/wsdl",
-        "wsdl-resources": "node ./lib-cjs/index.js -k --url=http://localhost:8010/ws_resources?wsdl --outDir=./src/services/wsdl",
-        "wsdl-store": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsStore?wsdl --outDir=./src/services/wsdl",
-        "wsdl-topology": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsTopology?wsdl --outDir=./src/services/wsdl",
-        "wsdl-workunits": "node ./lib-cjs/index.js -k --url=http://localhost:8010/WsWorkunits?wsdl --outDir=./src/services/wsdl",
-        "wsdl-all": "npm-run-all --aggregate-output -c --serial compile-util --parallel wsdl-access wsdl-account wsdl-cloud wsdl-codesign wsdl-dali wsdl-dfu wsdl-dfuxref wsdl-elk wsdl-esdlconfig wsdl-fileio wsdl-filespray wsdl-logaccess wsdl-machine wsdl-packageprocess wsdl-smc wsdl-resources wsdl-store wsdl-topology wsdl-workunits",
-        "wsdl": "npm-run-all --aggregate-output -c --serial compile-util --parallel wsdl-access wsdl-account wsdl-cloud wsdl-codesign wsdl-dali wsdl-dfu wsdl-dfuxref wsdl-elk wsdl-fileio wsdl-filespray wsdl-logaccess wsdl-packageprocess wsdl-smc wsdl-store wsdl-topology wsdl-workunits"
+        "test-browser": "vitest run --project browser",
+        "test-node": "vitest run --project node",
+        "test": "vitest run",
+        "coverage": "vitest run --coverage",
+        "update": "npx -y npm-check-updates -u -t minor",
+        "update-major": "npx -y npm-check-updates -u",
+        "wsdl-access": "node ./lib-esm/index.js -k --url=http://localhost:8010/ws_access?wsdl --outDir=./src/services/wsdl",
+        "wsdl-account": "node ./lib-esm/index.js -k --url=http://localhost:8010/Ws_Account?wsdl --outDir=./src/services/wsdl",
+        "wsdl-cloud": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsCloud?wsdl --outDir=./src/services/wsdl",
+        "wsdl-codesign": "node ./lib-esm/index.js -k --url=http://localhost:8010/ws_codesign?wsdl --outDir=./src/services/wsdl",
+        "wsdl-dali": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsDali?wsdl --outDir=./src/services/wsdl",
+        "wsdl-dfu": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsDfu?wsdl --outDir=./src/services/wsdl",
+        "wsdl-dfuxref": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsDFUXRef?wsdl --outDir=./src/services/wsdl",
+        "wsdl-elk": "node ./lib-esm/index.js -k --url=http://localhost:8010/ws_elk?wsdl --outDir=./src/services/wsdl",
+        "wsdl-esdlconfig": "node ./lib-esm/index.js -k --url=http://localhost:8010/ws_esdlconfig?wsdl --outDir=./src/services/wsdl",
+        "wsdl-fileio": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsFileIO?wsdl --outDir=./src/services/wsdl",
+        "wsdl-filespray": "node ./lib-esm/index.js -k --url=http://localhost:8010/FileSpray?wsdl --outDir=./src/services/wsdl",
+        "wsdl-logaccess": "node ./lib-esm/index.js -k --url=http://localhost:8010/ws_logaccess?wsdl --outDir=./src/services/wsdl",
+        "wsdl-machine": "node ./lib-esm/index.js -k --url=http://localhost:8010/ws_machine?wsdl --outDir=./src/services/wsdl",
+        "wsdl-packageprocess": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsPackageProcess?wsdl --outDir=./src/services/wsdl",
+        "wsdl-sasha": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsSasha?wsdl --outDir=./src/services/wsdl",
+        "wsdl-smc": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsSMC?wsdl --outDir=./src/services/wsdl",
+        "wsdl-resources": "node ./lib-esm/index.js -k --url=http://localhost:8010/ws_resources?wsdl --outDir=./src/services/wsdl",
+        "wsdl-store": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsStore?wsdl --outDir=./src/services/wsdl",
+        "wsdl-topology": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsTopology?wsdl --outDir=./src/services/wsdl",
+        "wsdl-workunits": "node ./lib-esm/index.js -k --url=http://localhost:8010/WsWorkunits?wsdl --outDir=./src/services/wsdl",
+        "wsdl-all": "npm-run-all --aggregate-output -c --serial build --parallel wsdl-*"
     },
     "dependencies": {
         "@hpcc-js/ddl-shim": "^2.22.0",
-        "@hpcc-js/util": "^2.53.0",
-        "@xmldom/xmldom": "0.9.3",
+        "@hpcc-js/util": "^3.1.0",
+        "@xmldom/xmldom": "0.9.4",
         "abort-controller": "3.0.0",
-        "node-fetch": "2.7.0",
+        "node-fetch": "3.3.2",
         "safe-buffer": "5.2.1",
         "tmp": "0.2.3",
         "undici": "5.28.4"
     },
     "devDependencies": {
-        "@hpcc-js/bundle": "^2.12.0",
+        "@hpcc-js/esbuild-plugins": "^1.2.0",
         "@types/d3-request": "1.0.9",
         "@types/d3-time-format": "2.3.4",
         "@types/node": "^18",
         "@types/xmldom": "0.1.34",
         "d3-array": "^1",
+        "d3-format": "^1",
         "d3-time-format": "^2",
-        "soap": "1.1.4",
-        "tslib": "2.7.0",
-        "typescript-formatter": "^7.2.2",
-        "whatwg-fetch": "3.6.20"
+        "soap": "1.1.5",
+        "typescript-formatter": "^7.2.2"
     },
     "repository": {
         "type": "git",
@@ -95,5 +90,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "fbbef050700b0e9d76ef99714856383d95155149"
+    "gitHead": "3f6146539f487dca08a35cdd5f94ca29609b4343"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/comms";
-export const PKG_VERSION = "2.98.0";
+export const PKG_VERSION = "3.1.0";
 export const BUILD_VERSION = "2.107.0";

package/src/clienttools/eclMeta.ts

@@ -2,7 +2,7 @@ import * as fs from "fs";
 import * as path from "path";
 
 import { Dictionary, DictionaryNoCase, find, SAXStackParser, scopedLogger, XMLNode } from "@hpcc-js/util";
-import { ClientTools, locateClientTools } from "./eclcc";
+import { ClientTools, locateClientTools } from "./eclcc.ts";
 
 const logger = scopedLogger("clienttools/eclmeta");
 

package/src/clienttools/eclcc.ts

@@ -5,7 +5,7 @@ import * as path from "path";
 import * as tmp from "tmp";
 
 import { exists, scopedLogger, xml2json, XMLNode } from "@hpcc-js/util";
-import { attachWorkspace, Workspace } from "./eclMeta";
+import { attachWorkspace, Workspace } from "./eclMeta.ts";
 
 const logger = scopedLogger("clienttools/eclcc");
 const exeExt = os.type() === "Windows_NT" ? ".exe" : "";

package/src/ecl/activity.ts

@@ -1,7 +1,7 @@
 import { debounce, StateObject } from "@hpcc-js/util";
-import { IConnection, IOptions } from "../connection";
-import { WsSMC, SMCService } from "../services/wsSMC";
-import { Workunit } from "./workunit";
+import { IConnection, IOptions } from "../connection.ts";
+import { WsSMC, SMCService } from "../services/wsSMC.ts";
+import { Workunit } from "./workunit.ts";
 
 let _activity: Activity;
 

package/src/ecl/dfuWorkunit.ts

@@ -1,9 +1,9 @@
 import { Cache, IEvent, scopedLogger, StateCallback, StateEvents, StateObject, StatePropCallback } from "@hpcc-js/util";
-import { IConnection, IOptions } from "../connection";
-import { ESPExceptions } from "../espConnection";
-import { WsSMC } from "../services/wsSMC";
-import { FileSpray, FileSprayService, UpdateDFUWorkunitEx } from "../services/fileSpray";
-import * as WsTopology from "../services/wsTopology";
+import { IConnection, IOptions } from "../connection.ts";
+import { ESPExceptions } from "../espConnection.ts";
+import { WsSMC } from "../services/wsSMC.ts";
+import { FileSpray, FileSprayService, UpdateDFUWorkunitEx } from "../services/fileSpray.ts";
+import * as WsTopology from "../services/wsTopology.ts";
 
 const logger = scopedLogger("@hpcc-js/comms/dfuWorkunit.ts");
 

package/src/ecl/graph.ts

@@ -1,8 +1,8 @@
 import { Cache, Edge, Graph, StateObject, StringAnyMap, Subgraph, Vertex, XMLNode } from "@hpcc-js/util";
-import { WsWorkunits } from "../services/wsWorkunits";
-import { BaseScope } from "./scope";
-import { Timer } from "./timer";
-import { Workunit } from "./workunit";
+import { WsWorkunits } from "../services/wsWorkunits.ts";
+import { BaseScope } from "./scope.ts";
+import { Timer } from "./timer.ts";
+import { Workunit } from "./workunit.ts";
 
 export interface ECLGraphEx extends WsWorkunits.ECLGraph {
     Time: number;

package/src/ecl/logicalFile.ts

@@ -1,7 +1,7 @@
 import { Cache, scopedLogger, StateObject } from "@hpcc-js/util";
-import { IConnection, IOptions } from "../connection";
-import { DFUService, WsDfu } from "../services/wsDFU";
-import { ESPExceptions } from "../espConnection";
+import { IConnection, IOptions } from "../connection.ts";
+import { DFUService, WsDfu } from "../services/wsDFU.ts";
+import { ESPExceptions } from "../espConnection.ts";
 
 const logger = scopedLogger("logicalFile.ts");
 

package/src/ecl/machine.ts

@@ -1,6 +1,6 @@
 import { Cache, StateObject } from "@hpcc-js/util";
-import { IConnection, IOptions } from "../connection";
-import { WsMachine, MachineService } from "../services/wsMachine";
+import { IConnection, IOptions } from "../connection.ts";
+import { WsMachine, MachineService } from "../services/wsMachine.ts";
 
 export class MachineCache extends Cache<{ Address: string }, Machine> {
     constructor() {

package/src/ecl/query.ts

@@ -1,11 +1,11 @@
 import { Cache, StateObject, scopedLogger, RecursivePartial } from "@hpcc-js/util";
 import { format as d3Format } from "d3-format";
-import { IConnection, IOptions } from "../connection";
-import { EclService, IWsEclRequest, IWsEclResponse, IWsEclResult } from "../services/wsEcl";
-import { WorkunitsService, WsWorkunits } from "../services/wsWorkunits";
-import { Topology } from "./topology";
-import { Workunit, IScope } from "./workunit";
-import { QueryGraph } from "./queryGraph";
+import { IConnection, IOptions } from "../connection.ts";
+import { EclService, IWsEclRequest, IWsEclResponse, IWsEclResult } from "../services/wsEcl.ts";
+import { WorkunitsService, WsWorkunits } from "../services/wsWorkunits.ts";
+import { Topology } from "./topology.ts";
+import { Workunit, IScope } from "./workunit.ts";
+import { QueryGraph } from "./queryGraph.ts";
 
 export { QueryGraph };
 
@@ -119,9 +119,9 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
         const wsEclService = await this.wsEclService();
         try {
             this._requestSchema = await wsEclService?.requestJson(this.QuerySet, this.QueryId) ?? [];
-        } catch (e) {
+        } catch (e: any) {
             //  See:  https://track.hpccsystems.com/browse/HPCC-29827
-            logger.debug(e);
+            logger.debug(e.message ?? e);
             this._requestSchema = [];
         }
     }
@@ -130,9 +130,9 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
         const wsEclService = await this.wsEclService();
         try {
             this._responseSchema = await wsEclService?.responseJson(this.QuerySet, this.QueryId) ?? {};
-        } catch (e) {
+        } catch (e: any) {
             //  See:  https://track.hpccsystems.com/browse/HPCC-29827
-            logger.debug(e);
+            logger.debug(e.message ?? e);
             this._responseSchema = {};
         }
     }
@@ -209,9 +209,9 @@ export class Query extends StateObject<QueryEx, QueryEx> implements QueryEx {
                 }
                 return results;
             }) ?? [];
-        } catch (e) {
+        } catch (e: any) {
             //  See:  https://track.hpccsystems.com/browse/HPCC-29827
-            logger.debug(e);
+            logger.debug(e.message ?? e);
             return [];
         }
     }

package/src/ecl/queryGraph.ts

@@ -682,8 +682,8 @@ export class QueryGraph {
     }
 
     getChildByTagName(docNode: HTMLElement, tagName: string): HTMLElement | null {
-        let retVal = null;
-        Array.from(docNode.childNodes).some((childNode: HTMLElement, idx) => {
+        let retVal: HTMLElement | null = null;
+        Array.from(docNode.childNodes as NodeListOf<HTMLElement>).some((childNode) => {
             if (childNode.tagName === tagName) {
                 retVal = childNode;
                 return true;
@@ -694,7 +694,7 @@ export class QueryGraph {
 
     walkDocument(docNode: HTMLElement, id: string): Subgraph | Vertex | Edge {
         const retVal: any = this.getItem(docNode, id);
-        docNode.childNodes.forEach((childNode: HTMLElement, idx) => {
+        (docNode.childNodes as NodeListOf<HTMLElement>).forEach((childNode) => {
             switch (childNode.nodeType) {
                 case 1:     // 	ELEMENT_NODE
                     switch (childNode.tagName) {

package/src/ecl/resource.ts

@@ -1,5 +1,5 @@
 import { StateObject } from "@hpcc-js/util";
-import { Workunit } from "./workunit";
+import { Workunit } from "./workunit.ts";
 
 export interface ResourceEx {
     URL: string;

package/src/ecl/result.ts

@@ -1,8 +1,8 @@
 import { Cache, exists, StateObject } from "@hpcc-js/util";
-import { IConnection, IOptions } from "../connection";
-import { WsDfu } from "../services/wsDFU";
-import { isECLResult, WorkunitsService, WsWorkunits } from "../services/wsWorkunits";
-import { parseXSD, XSDSchema, XSDXMLNode } from "./xsdParser";
+import { IConnection, IOptions } from "../connection.ts";
+import { WsDfu } from "../services/wsDFU.ts";
+import { isECLResult, WorkunitsService, WsWorkunits } from "../services/wsWorkunits.ts";
+import { parseXSD, XSDSchema, XSDXMLNode } from "./xsdParser.ts";
 
 export class GlobalResultCache extends Cache<{ BaseUrl: string, Wuid: string, ResultName: string }, Result> {
     constructor() {

package/src/ecl/scope.ts

@@ -1,7 +1,7 @@
 import { StateObject, StringAnyMap } from "@hpcc-js/util";
 // import { utcFormat, utcParse } from "d3-time-format";
-import { WsWorkunits } from "../services/wsWorkunits";
-import { Workunit } from "./workunit";
+import { WsWorkunits } from "../services/wsWorkunits.ts";
+import { Workunit } from "./workunit.ts";
 
 // const formatter = utcFormat("%Y-%m-%dT%H:%M:%S.%LZ");
 // const parser = utcParse("%Y-%m-%dT%H:%M:%S.%LZ");

package/src/ecl/sourceFile.ts

@@ -1,6 +1,6 @@
 import { StateObject } from "@hpcc-js/util";
-import { IConnection, IOptions } from "../connection";
-import { WorkunitsService, WsWorkunits } from "../services/wsWorkunits";
+import { IConnection, IOptions } from "../connection.ts";
+import { WorkunitsService, WsWorkunits } from "../services/wsWorkunits.ts";
 
 export interface ECLSourceFileEx extends WsWorkunits.ECLSourceFile {
     Wuid: string;

package/src/ecl/store.ts

@@ -1,6 +1,6 @@
 import { Cache, Dispatch, IObserverHandle, Message } from "@hpcc-js/util";
-import { IConnection, IOptions } from "../connection";
-import { StoreService } from "../services/wsStore";
+import { IConnection, IOptions } from "../connection.ts";
+import { StoreService } from "../services/wsStore.ts";
 
 export class StoreCache extends Cache<{ BaseUrl: string, Name: string, UserSpecific: boolean, Namespace: string }, Store> {
     constructor() {
@@ -38,7 +38,7 @@ export class Store {
     readonly UserSpecific: boolean;
     readonly Namespace: string;
 
-    protected _dispatch = new Dispatch();
+    protected _dispatch = new Dispatch<ValueChangedMessage>();
 
     static attach(optsConnection: IOptions | IConnection | StoreService, Name: string = "HPCCApps", Namespace: string, UserSpecific: boolean = true): Store {
         const retVal: Store = _store.get({ BaseUrl: optsConnection.baseUrl, Name, UserSpecific, Namespace }, () => {

package/src/ecl/targetCluster.ts

@@ -1,8 +1,8 @@
 import { Cache, StateObject } from "@hpcc-js/util";
-import { IConnection, IOptions } from "../connection";
-import { WsMachine, WsMachineEx, MachineService } from "../services/wsMachine";
-import { TopologyService, WsTopology } from "../services/wsTopology";
-import { Machine } from "./machine";
+import { IConnection, IOptions } from "../connection.ts";
+import { WsMachine, WsMachineEx, MachineService } from "../services/wsMachine.ts";
+import { TopologyService, WsTopology } from "../services/wsTopology.ts";
+import { Machine } from "./machine.ts";
 
 export class TargetClusterCache extends Cache<{ BaseUrl: string, Name: string }, TargetCluster> {
     constructor() {

package/src/ecl/timer.ts

@@ -1,6 +1,6 @@
 import { espTime2Seconds, StateObject } from "@hpcc-js/util";
-import { IConnection, IOptions } from "../connection";
-import { WorkunitsService, WsWorkunits } from "../services/wsWorkunits";
+import { IConnection, IOptions } from "../connection.ts";
+import { WorkunitsService, WsWorkunits } from "../services/wsWorkunits.ts";
 
 export interface ECLTimerEx extends WsWorkunits.ECLTimer {
     Wuid: string;

package/src/ecl/topology.ts

@@ -1,7 +1,7 @@
 import { Cache, exists, StateCallback, StateEvents, StateObject, StatePropCallback } from "@hpcc-js/util";
-import { IConnection, IOptions } from "../connection";
-import { TopologyService, WsTopology } from "../services/wsTopology";
-import { TargetCluster } from "./targetCluster";
+import { IConnection, IOptions } from "../connection.ts";
+import { TopologyService, WsTopology } from "../services/wsTopology.ts";
+import { TargetCluster } from "./targetCluster.ts";
 
 export class TopologyCache extends Cache<{ BaseUrl: string }, Topology> {
     constructor() {

package/src/ecl/workunit.ts

@@ -1,17 +1,17 @@
 import { Cache, deepMixinT, IEvent, RecursivePartial, scopedLogger, StateCallback, StateEvents, StateObject, StatePropCallback, StringAnyMap, XMLNode } from "@hpcc-js/util";
 import { format as d3Format } from "d3-format";
 import { utcFormat, utcParse } from "d3-time-format";
-import { IConnection, IOptions } from "../connection";
-import { ESPExceptions } from "../espConnection";
-import { WsSMC } from "../services/wsSMC";
-import * as WsTopology from "../services/wsTopology";
-import { WsWorkunits, WUStateID, WorkunitsService, WorkunitsServiceEx, WUUpdate } from "../services/wsWorkunits";
-import { createGraph, createXGMMLGraph, ECLGraph, GraphCache, ScopeGraph, XGMMLGraph, XGMMLVertex } from "./graph";
-import { Resource } from "./resource";
-import { Result, ResultCache } from "./result";
-import { BaseScope, Scope } from "./scope";
-import { SourceFile } from "./sourceFile";
-import { Timer } from "./timer";
+import { IConnection, IOptions } from "../connection.ts";
+import { ESPExceptions } from "../espConnection.ts";
+import { WsSMC } from "../services/wsSMC.ts";
+import * as WsTopology from "../services/wsTopology.ts";
+import { WsWorkunits, WUStateID, WorkunitsService, WorkunitsServiceEx, WUUpdate } from "../services/wsWorkunits.ts";
+import { createGraph, createXGMMLGraph, ECLGraph, GraphCache, ScopeGraph, XGMMLGraph, XGMMLVertex } from "./graph.ts";
+import { Resource } from "./resource.ts";
+import { Result, ResultCache } from "./result.ts";
+import { BaseScope, Scope } from "./scope.ts";
+import { SourceFile } from "./sourceFile.ts";
+import { Timer } from "./timer.ts";
 
 const formatter = utcFormat("%Y-%m-%dT%H:%M:%S.%LZ");
 const parser = utcParse("%Y-%m-%dT%H:%M:%S.%LZ");

package/src/ecl/xsdParser.ts

@@ -215,7 +215,6 @@ export function parseXSD(xml: string): XSDSchema {
 class XSDParser2 extends XSDParser {
     _rootName: string;
     schema: XSDSchema = new XSDSchema();
-    simpleType: XSDSimpleType;
     simpleTypes: { [name: string]: XSDSimpleType } = {};
 
     xsdStack: Stack<XSDXMLNode> = new Stack<XSDXMLNode>();

package/src/espConnection.ts

@@ -1,5 +1,5 @@
 import { join } from "@hpcc-js/util";
-import { createConnection, IConnection, IOptions, ResponseType } from "./connection";
+import { createConnection, IConnection, IOptions, ResponseType } from "./connection.ts";
 
 export type ESPResponseType = ResponseType | "json2" | "xsd";
 

package/src/index-common.ts

@@ -1,41 +1,41 @@
-export * from "./__package__";
+export * from "./__package__.ts";
 
-export * from "./services/fileSpray";
-export * from "./services/wsAccess";
-export * from "./services/wsAccount";
-export * from "./services/wsCloud";
-export * from "./services/wsCodesign";
-export * from "./services/wsDali";
-export * from "./services/wsDFU";
-export * from "./services/wsDFUXRef";
-export * from "./services/wsEcl";
-export * from "./services/wsElk";
-export * from "./services/wsLogaccess";
-export * from "./services/wsMachine";
-export * from "./services/wsPackageProcess";
-export * from "./services/wsResources";
-export * from "./services/wsSasha";
-export * from "./services/wsSMC";
-export * from "./services/wsStore";
-export * from "./services/wsTopology";
-export * from "./services/wsWorkunits";
+export * from "./services/fileSpray.ts";
+export * from "./services/wsAccess.ts";
+export * from "./services/wsAccount.ts";
+export * from "./services/wsCloud.ts";
+export * from "./services/wsCodesign.ts";
+export * from "./services/wsDali.ts";
+export * from "./services/wsDFU.ts";
+export * from "./services/wsDFUXRef.ts";
+export * from "./services/wsEcl.ts";
+export * from "./services/wsElk.ts";
+export * from "./services/wsLogaccess.ts";
+export * from "./services/wsMachine.ts";
+export * from "./services/wsPackageProcess.ts";
+export * from "./services/wsResources.ts";
+export * from "./services/wsSasha.ts";
+export * from "./services/wsSMC.ts";
+export * from "./services/wsStore.ts";
+export * from "./services/wsTopology.ts";
+export * from "./services/wsWorkunits.ts";
 
-export * from "./ecl/activity";
-export * from "./ecl/graph";
-export * from "./ecl/logicalFile";
-export * from "./ecl/machine";
-export * from "./ecl/query";
-export * from "./ecl/resource";
-export * from "./ecl/result";
-export * from "./ecl/scope";
-export * from "./ecl/sourceFile";
-export * from "./ecl/store";
-export * from "./ecl/timer";
-export * from "./ecl/topology";
-export * from "./ecl/targetCluster";
-export * from "./ecl/dfuWorkunit";
-export * from "./ecl/workunit";
-export * from "./ecl/xsdParser";
+export * from "./ecl/activity.ts";
+export * from "./ecl/graph.ts";
+export * from "./ecl/logicalFile.ts";
+export * from "./ecl/machine.ts";
+export * from "./ecl/query.ts";
+export * from "./ecl/resource.ts";
+export * from "./ecl/result.ts";
+export * from "./ecl/scope.ts";
+export * from "./ecl/sourceFile.ts";
+export * from "./ecl/store.ts";
+export * from "./ecl/timer.ts";
+export * from "./ecl/topology.ts";
+export * from "./ecl/targetCluster.ts";
+export * from "./ecl/dfuWorkunit.ts";
+export * from "./ecl/workunit.ts";
+export * from "./ecl/xsdParser.ts";
 
-export * from "./connection";
-export * from "./espConnection";
+export * from "./connection.ts";
+export * from "./espConnection.ts";

package/src/index.node.ts

@@ -4,13 +4,17 @@ import { DOMParser } from "@xmldom/xmldom";
 root.DOMParser = DOMParser;
 
 //  fetch polyfill  ---
-import fetch from "node-fetch";
+import fetch, { Headers, Request, Response, } from "node-fetch";
+
 import * as https from "https";
 import { Agent, setGlobalDispatcher } from "undici";
 
 if (typeof root.fetch === "undefined") {
     //  NodeJS < v18  ---
     root.fetch = fetch;
+    root.Headers = Headers;
+    root.Request = Request;
+    root.Response = Response;
     root.fetch.__rejectUnauthorizedAgent = new https.Agent({
         rejectUnauthorized: false
     });
@@ -31,7 +35,7 @@ if (typeof root.AbortController === "undefined") {
     root.AbortController = AbortController;
 }
 
-import { trustwave } from "./pem/trustwave";
+import { trustwave } from "./pem/trustwave.ts";
 
 let globalCA = "";
 if (https.globalAgent.options.ca !== undefined) {
@@ -61,8 +65,8 @@ if (typeof root.btoa === "undefined") {
     };
 }
 
-export * from "./index-common";
+export * from "./index-common.ts";
 
 //  Client Tools  ---
-export * from "./clienttools/eclcc";
-export * from "./clienttools/eclMeta";
+export * from "./clienttools/eclcc.ts";
+export * from "./clienttools/eclMeta.ts";

package/src/index.ts

@@ -1,3 +1 @@
-import "whatwg-fetch";
-
-export * from "./index-common";
+export * from "./index-common.ts";

package/src/services/fileSpray.ts

@@ -1,4 +1,4 @@
-import { FileSprayServiceBase, FileSpray } from "./wsdl/FileSpray/v1.26/FileSpray";
+import { FileSprayServiceBase, FileSpray } from "./wsdl/FileSpray/v1.26/FileSpray.ts";
 
 export {
     FileSpray

package/src/services/wsAccess.ts

@@ -1,4 +1,4 @@
-import { AccessServiceBase, WsAccess } from "./wsdl/ws_access/v1.17/ws_access";
+import { AccessServiceBase, WsAccess } from "./wsdl/ws_access/v1.17/ws_access.ts";
 
 export {
     WsAccess