Esm modules fix

.semgrepignore

@@ -1,7 +1,7 @@
 website/**
 
 # Just used for build so ignoring
-s2tQuicktypeUtil.js
+s2tQuicktypeUtil.cjs
 t2sQuicktypeUtil.js
 
 # API schema set for localhost gets picked up by semgrep rule

package.json

@@ -61,7 +61,8 @@
     "istanbul-merge": "^2.0.0",
     "lint-staged": "^15.2.10",
     "nyc": "17.1.0",
-    "prettier": "3.4.1"
+    "prettier": "3.4.1",
+    "tsx": "^4.20.5"
   },
   "lint-staged": {
     "**/*": "prettier --write --ignore-unknown"

packages/fdc3-agent-proxy/cucumber.yml

@@ -5,7 +5,7 @@ default:
     - junit:test-results.xml
   paths: 
    - test/features/*.feature
-  require: 
+  import: 
    - test/step-definitions/*.steps.ts 
    - test/support/*.ts
    - test/world/index.ts

packages/fdc3-agent-proxy/package.json

@@ -1,59 +1,60 @@
 {
-  "name": "@finos/fdc3-agent-proxy",
-  "version": "2.2.0",
-  "author": "Fintech Open Source Foundation (FINOS)",
-  "homepage": "https://fdc3.finos.org",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/finos/FDC3.git"
-  },
-  "publishConfig": {
-    "tag": "latest"
-  },
-  "license": "Apache-2.0",
-  "main": "dist/src/index.js",
-  "types": "dist/src/index.d.ts",
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "tsc --module es2022",
-    "test": "tsc && nyc --reporter=lcov --reporter=text  --reporter json  cucumber-js",
-    "clean": "rimraf dist cucumber-report.html coverage .nyc_output node_modules test-results.xml",
-    "lint": "eslint src/"
-  },
-  "dependencies": {
-    "@finos/fdc3-standard": "2.2.0"
-  },
-  "devDependencies": {
-    "@cucumber/cucumber": "10.3.1",
-    "@cucumber/html-formatter": "11.0.4",
-    "@cucumber/messages": "^28.1.0",
-    "@cucumber/pretty-formatter": "1.0.1",
-    "@eslint/js": "^9.19.0",
-    "@finos/testing": "2.2.0",
-    "@types/expect": "24.3.0",
-    "@types/lodash": "4.14.167",
-    "@types/node": "^20.16.11",
-    "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^8.18.2",
-    "@typescript-eslint/parser": "^8.18.2",
-    "cucumber-console-formatter": "1.0.0",
-    "eslint": "^9.32.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-prettier": "3.3.1",
-    "expect": "^29.7.0",
-    "globals": "^15.14.0",
-    "is-ci": "2.0.0",
-    "jsonpath-plus": "^10.1.0",
-    "nyc": "17.1.0",
-    "prettier": "3.4.1",
-    "rimraf": "^6.0.1",
-    "ts-node": "^10.9.2",
-    "tsx": "^4.19.1",
-    "typescript": "^5.6.3",
-    "typescript-eslint": "^8.17.0",
-    "uuid": "^9.0.1"
-  }
-}
+    "name": "@finos/fdc3-agent-proxy",
+    "version": "2.2.0",
+    "author": "Fintech Open Source Foundation (FINOS)",
+    "homepage": "https://fdc3.finos.org",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/finos/FDC3.git"
+    },
+    "publishConfig": {
+        "tag": "latest"
+    },
+    "license": "Apache-2.0",
+    "main": "dist/src/index.js",
+    "types": "dist/src/index.d.ts",
+    "files": [
+        "dist"
+    ],
+    "scripts": {
+        "build": "tsc",
+        "test": "tsc && nyc --reporter=lcov --reporter=text  --reporter json  cucumber-js",
+        "clean": "rimraf dist cucumber-report.html coverage .nyc_output node_modules test-results.xml",
+        "lint": "eslint src/"
+    },
+    "dependencies": {
+        "@finos/fdc3-standard": "2.2.0"
+    },
+    "devDependencies": {
+        "@cucumber/cucumber": "10.3.1",
+        "@cucumber/html-formatter": "11.0.4",
+        "@cucumber/messages": "^28.1.0",
+        "@cucumber/pretty-formatter": "1.0.1",
+        "@eslint/js": "^9.19.0",
+        "@finos/testing": "2.2.0",
+        "@types/expect": "24.3.0",
+        "@types/lodash": "4.14.167",
+        "@types/node": "^20.16.11",
+        "@types/uuid": "^10.0.0",
+        "@typescript-eslint/eslint-plugin": "^8.18.2",
+        "@typescript-eslint/parser": "^8.18.2",
+        "cucumber-console-formatter": "1.0.0",
+        "eslint": "^9.32.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-import": "^2.31.0",
+        "eslint-plugin-prettier": "3.3.1",
+        "expect": "^29.7.0",
+        "globals": "^15.14.0",
+        "is-ci": "2.0.0",
+        "jsonpath-plus": "^10.1.0",
+        "nyc": "17.1.0",
+        "prettier": "3.4.1",
+        "rimraf": "^6.0.1",
+        "ts-node": "^10.9.2",
+        "tsx": "^4.19.1",
+        "typescript": "^5.6.3",
+        "typescript-eslint": "^8.17.0",
+        "uuid": "^9.0.1"
+    },
+    "type": "module"
+}

packages/fdc3-agent-proxy/src/DesktopAgentProxy.ts

@@ -11,13 +11,13 @@ import {
   Listener,
   LogLevel,
 } from '@finos/fdc3-standard';
-import { ChannelSupport } from './channels/ChannelSupport';
-import { AppSupport } from './apps/AppSupport';
-import { IntentSupport } from './intents/IntentSupport';
+import { ChannelSupport } from './channels/ChannelSupport.js';
+import { AppSupport } from './apps/AppSupport.js';
+import { IntentSupport } from './intents/IntentSupport.js';
 import { Connectable, Channel } from '@finos/fdc3-standard';
 import { Context } from '@finos/fdc3-context';
-import { HeartbeatSupport } from './heartbeat/HeartbeatSupport';
-import { Logger } from './util/Logger';
+import { HeartbeatSupport } from './heartbeat/HeartbeatSupport.js';
+import { Logger } from './util/Logger.js';
 
 /**
  * This splits out the functionality of the desktop agent into

packages/fdc3-agent-proxy/src/Messaging.ts

@@ -1,10 +1,10 @@
 import { AppIdentifier } from '@finos/fdc3-standard';
-import { RegisterableListener } from './listeners/RegisterableListener';
+import { RegisterableListener } from './listeners/RegisterableListener.js';
 import {
   AppRequestMessage,
   AgentResponseMessage,
   WebConnectionProtocol6Goodbye,
-} from '@finos/fdc3-schema/dist/generated/api/BrowserTypes';
+} from '@finos/fdc3-schema/dist/generated/api/BrowserTypes.js';
 
 export interface Messaging {
   /**

packages/fdc3-agent-proxy/src/apps/DefaultAppSupport.ts

@@ -1,7 +1,7 @@
 import { AppIdentifier, AppMetadata, ImplementationMetadata, OpenError, ResolveError } from '@finos/fdc3-standard';
 import { Context } from '@finos/fdc3-context';
-import { AppSupport } from './AppSupport';
-import { Messaging } from '../Messaging';
+import { AppSupport } from './AppSupport.js';
+import { Messaging } from '../Messaging.js';
 import {
   FindInstancesRequest,
   FindInstancesResponse,
@@ -11,9 +11,9 @@ import {
   GetInfoResponse,
   OpenRequest,
   OpenResponse,
-} from '@finos/fdc3-schema/dist/generated/api/BrowserTypes';
-import { throwIfUndefined } from '../util/throwIfUndefined';
-import { Logger } from '../util/Logger';
+} from '@finos/fdc3-schema/dist/generated/api/BrowserTypes.js';
+import { throwIfUndefined } from '../util/throwIfUndefined.js';
+import { Logger } from '../util/Logger.js';
 
 export class DefaultAppSupport implements AppSupport {
   readonly messaging: Messaging;

packages/fdc3-agent-proxy/src/channels/DefaultChannel.ts

@@ -1,17 +1,17 @@
 import { ContextHandler, DisplayMetadata, Listener, Channel, EventHandler } from '@finos/fdc3-standard';
 import { Context } from '@finos/fdc3-context';
-import { Messaging } from '../Messaging';
-import { DefaultContextListener } from '../listeners/DefaultContextListener';
+import { Messaging } from '../Messaging.js';
+import { DefaultContextListener } from '../listeners/DefaultContextListener.js';
 import {
   BroadcastRequest,
   BroadcastResponse,
   ClearContextRequest,
   ClearContextResponse,
   GetCurrentContextRequest,
   GetCurrentContextResponse,
-} from '@finos/fdc3-schema/generated/api/BrowserTypes';
-import { RegisterableListener } from '../listeners/RegisterableListener';
-import { EventListener } from '../listeners/EventListener';
+} from '@finos/fdc3-schema/generated/api/BrowserTypes.js';
+import { RegisterableListener } from '../listeners/RegisterableListener.js';
+import { EventListener } from '../listeners/EventListener.js';
 
 export class DefaultChannel implements Channel {
   protected readonly messaging: Messaging;

packages/fdc3-agent-proxy/src/channels/DefaultChannelSupport.ts

@@ -8,13 +8,13 @@ import {
   ChannelError,
   ApiEvent,
 } from '@finos/fdc3-standard';
-import { Messaging } from '../Messaging';
-import { ChannelSupport } from './ChannelSupport';
-import { DefaultPrivateChannel } from './DefaultPrivateChannel';
-import { DefaultChannel } from './DefaultChannel';
-import { DefaultContextListener } from '../listeners/DefaultContextListener';
-import { UserChannelContextListener } from '../listeners/UserChannelContextListener';
-import { EventListener } from '../listeners/EventListener';
+import { Messaging } from '../Messaging.js';
+import { ChannelSupport } from './ChannelSupport.js';
+import { DefaultPrivateChannel } from './DefaultPrivateChannel.js';
+import { DefaultChannel } from './DefaultChannel.js';
+import { DefaultContextListener } from '../listeners/DefaultContextListener.js';
+import { UserChannelContextListener } from '../listeners/UserChannelContextListener.js';
+import { EventListener } from '../listeners/EventListener.js';
 import {
   GetCurrentChannelResponse,
   GetCurrentChannelRequest,
@@ -29,9 +29,9 @@ import {
   JoinUserChannelResponse,
   JoinUserChannelRequest,
   ChannelChangedEvent,
-} from '@finos/fdc3-schema/dist/generated/api/BrowserTypes';
-import { throwIfUndefined } from '../util/throwIfUndefined';
-import { Logger } from '../util/Logger';
+} from '@finos/fdc3-schema/dist/generated/api/BrowserTypes.js';
+import { throwIfUndefined } from '../util/throwIfUndefined.js';
+import { Logger } from '../util/Logger.js';
 
 export class DefaultChannelSupport implements ChannelSupport {
   readonly messaging: Messaging;

packages/fdc3-agent-proxy/src/channels/DefaultPrivateChannel.ts

@@ -6,20 +6,20 @@ import {
   PrivateChannel,
   PrivateChannelEventTypes,
 } from '@finos/fdc3-standard';
-import { DefaultChannel } from './DefaultChannel';
-import { Messaging } from '../Messaging';
+import { DefaultChannel } from './DefaultChannel.js';
+import { Messaging } from '../Messaging.js';
 import {
   PrivateChannelNullEventListener,
   PrivateChannelAddContextEventListener,
   PrivateChannelDisconnectEventListener,
   PrivateChannelUnsubscribeEventListener,
-} from '../listeners/PrivateChannelEventListener';
-import { DefaultContextListener } from '../listeners/DefaultContextListener';
-import { RegisterableListener } from '../listeners/RegisterableListener';
+} from '../listeners/PrivateChannelEventListener.js';
+import { DefaultContextListener } from '../listeners/DefaultContextListener.js';
+import { RegisterableListener } from '../listeners/RegisterableListener.js';
 import {
   PrivateChannelDisconnectRequest,
   PrivateChannelDisconnectResponse,
-} from '@finos/fdc3-schema/dist/generated/api/BrowserTypes';
+} from '@finos/fdc3-schema/dist/generated/api/BrowserTypes.js';
 
 export class DefaultPrivateChannel extends DefaultChannel implements PrivateChannel {
   constructor(messaging: Messaging, messageExchangeTimeout: number, id: string) {

packages/fdc3-agent-proxy/src/heartbeat/DefaultHeartbeatSupport.ts

@@ -1,6 +1,6 @@
-import { HeartbeatListener } from '../listeners/HeartbeatListener';
-import { Messaging } from '../Messaging';
-import { HeartbeatSupport } from './HeartbeatSupport';
+import { HeartbeatListener } from '../listeners/HeartbeatListener.js';
+import { Messaging } from '../Messaging.js';
+import { HeartbeatSupport } from './HeartbeatSupport.js';
 
 /**
  * Handles disconnection and heartbeats for the proxy.

packages/fdc3-agent-proxy/src/index.ts

@@ -1,17 +1,17 @@
-import { DesktopAgentProxy } from './DesktopAgentProxy';
-import { Messaging } from './Messaging';
-import { AbstractMessaging } from './messaging/AbstractMessaging';
-import { DefaultChannel } from './channels/DefaultChannel';
-import { ChannelSupport } from './channels/ChannelSupport';
-import { DefaultIntentSupport } from './intents/DefaultIntentSupport';
-import { DefaultChannelSupport } from './channels/DefaultChannelSupport';
-import { IntentSupport } from './intents/IntentSupport';
-import { RegisterableListener } from './listeners/RegisterableListener';
-import { DefaultAppSupport } from './apps/DefaultAppSupport';
-import { AppSupport } from './apps/AppSupport';
-import { DefaultHeartbeatSupport } from './heartbeat/DefaultHeartbeatSupport';
+import { DesktopAgentProxy } from './DesktopAgentProxy.js';
+import { Messaging } from './Messaging.js';
+import { AbstractMessaging } from './messaging/AbstractMessaging.js';
+import { DefaultChannel } from './channels/DefaultChannel.js';
+import { ChannelSupport } from './channels/ChannelSupport.js';
+import { DefaultIntentSupport } from './intents/DefaultIntentSupport.js';
+import { DefaultChannelSupport } from './channels/DefaultChannelSupport.js';
+import { IntentSupport } from './intents/IntentSupport.js';
+import { RegisterableListener } from './listeners/RegisterableListener.js';
+import { DefaultAppSupport } from './apps/DefaultAppSupport.js';
+import { AppSupport } from './apps/AppSupport.js';
+import { DefaultHeartbeatSupport } from './heartbeat/DefaultHeartbeatSupport.js';
 import { Connectable } from '@finos/fdc3-standard';
-import { AbstractFDC3Logger } from './util/AbstractFDC3Logger';
+import { AbstractFDC3Logger } from './util/AbstractFDC3Logger.js';
 
 export {
   type Messaging,

packages/fdc3-agent-proxy/src/intents/DefaultIntentResolution.ts

@@ -1,5 +1,5 @@
 import { AppIdentifier, IntentResolution, IntentResult } from '@finos/fdc3-standard';
-import { Messaging } from '../Messaging';
+import { Messaging } from '../Messaging.js';
 
 export class DefaultIntentResolution implements IntentResolution {
   readonly messaging: Messaging;

packages/fdc3-agent-proxy/src/intents/DefaultIntentSupport.ts

@@ -9,12 +9,12 @@ import {
   IntentResolver,
   IntentResolutionChoice,
 } from '@finos/fdc3-standard';
-import { IntentSupport } from './IntentSupport';
-import { Messaging } from '../Messaging';
-import { DefaultIntentResolution } from './DefaultIntentResolution';
-import { DefaultIntentListener } from '../listeners/DefaultIntentListener';
-import { DefaultChannel } from '../channels/DefaultChannel';
-import { DefaultPrivateChannel } from '../channels/DefaultPrivateChannel';
+import { IntentSupport } from './IntentSupport.js';
+import { Messaging } from '../Messaging.js';
+import { DefaultIntentResolution } from './DefaultIntentResolution.js';
+import { DefaultIntentListener } from '../listeners/DefaultIntentListener.js';
+import { DefaultChannel } from '../channels/DefaultChannel.js';
+import { DefaultPrivateChannel } from '../channels/DefaultPrivateChannel.js';
 import { Context } from '@finos/fdc3-context';
 import {
   FindIntentRequest,
@@ -26,8 +26,8 @@ import {
   RaiseIntentRequest,
   RaiseIntentResponse,
   RaiseIntentResultResponse,
-} from '@finos/fdc3-schema/dist/generated/api/BrowserTypes';
-import { throwIfUndefined } from '../util/throwIfUndefined';
+} from '@finos/fdc3-schema/dist/generated/api/BrowserTypes.js';
+import { throwIfUndefined } from '../util/throwIfUndefined.js';
 
 const convertIntentResult = async (
   { payload }: RaiseIntentResultResponse,