From 7274bc36d73ea944b3e0c52edd6ce548dca815b4 Mon Sep 17 00:00:00 2001 From: Rob Moffat Date: Wed, 11 Sep 2024 12:18:56 +0100 Subject: [PATCH] Renamed fdc3-core to fdc3-standard --- .github/workflows/build.yml | 3 +- .github/workflows/test.yml | 1 - package-lock.json | 371 +++++------------- package.json | 2 +- packages/da-proxy/package.json | 2 +- packages/da-proxy/src/BasicDesktopAgent.ts | 4 +- packages/da-proxy/src/Messaging.ts | 2 +- packages/da-proxy/src/apps/AppSupport.ts | 2 +- .../da-proxy/src/apps/DefaultAppSupport.ts | 4 +- .../da-proxy/src/channels/ChannelSupport.ts | 2 +- .../da-proxy/src/channels/DefaultChannel.ts | 4 +- .../src/channels/DefaultChannelSupport.ts | 4 +- .../src/channels/DefaultPrivateChannel.ts | 4 +- .../src/handshake/DefaultHandshakeSupport.ts | 2 +- .../src/handshake/HandshakeSupport.ts | 2 +- packages/da-proxy/src/index.ts | 2 +- .../src/intents/DefaultIntentResolution.ts | 2 +- .../src/intents/DefaultIntentSupport.ts | 6 +- .../da-proxy/src/intents/IntentSupport.ts | 2 +- .../src/listeners/DefaultContextListener.ts | 4 +- .../src/listeners/DefaultIntentListener.ts | 4 +- .../listeners/PrivateChannelEventListener.ts | 2 +- .../src/listeners/RegisterableListener.ts | 2 +- .../src/messaging/AbstractMessaging.ts | 4 +- .../test/step-definitions/channels.steps.ts | 2 +- .../test/step-definitions/intents.steps.ts | 2 +- .../da-proxy/test/support/TestMessaging.ts | 4 +- .../test/support/responses/ChannelState.ts | 2 +- .../support/responses/CreatePrivateChannel.ts | 2 +- .../responses/DisconnectPrivateChannel.ts | 2 +- .../test/support/responses/FindInstances.ts | 2 +- .../test/support/responses/FindIntent.ts | 2 +- .../support/responses/FindIntentByContext.ts | 2 +- .../test/support/responses/GetAppMetadata.ts | 2 +- .../support/responses/GetOrCreateChannel.ts | 4 +- .../test/support/responses/GetUserChannels.ts | 2 +- .../test/support/responses/Handshake.ts | 2 +- .../test/support/responses/IntentResult.ts | 2 +- .../da-proxy/test/support/responses/Open.ts | 2 +- .../test/support/responses/RaiseIntent.ts | 4 +- .../responses/RaiseIntentForContext.ts | 4 +- .../test/support/responses/support.ts | 2 +- packages/da-proxy/tsconfig.json | 2 +- packages/fdc3-all/package.json | 2 +- packages/fdc3-get-agent/package.json | 2 +- .../fdc3-get-agent/src/apps/NoopAppSupport.ts | 2 +- packages/fdc3-get-agent/src/index.ts | 2 +- .../src/messaging/AbstractWebMessaging.ts | 2 +- .../src/messaging/MessagePortMessaging.ts | 2 +- .../src/messaging/message-port.ts | 4 +- .../src/strategies/ElectronEventLoader.ts | 4 +- .../fdc3-get-agent/src/strategies/Loader.ts | 4 +- .../src/strategies/PostMessageLoader.ts | 2 +- .../src/strategies/TimeoutLoader.ts | 2 +- .../src/strategies/post-message.ts | 2 +- .../src/ui/AbstractUIComponent.ts | 2 +- .../ui/DefaultDesktopAgentChannelSelector.ts | 4 +- .../ui/DefaultDesktopAgentIntentResolver.ts | 4 +- .../src/ui/NullChannelSelector.ts | 6 +- .../src/ui/NullIIntentResolver.ts | 4 +- .../step-definitions/desktop-agent.steps.ts | 2 +- .../fdc3-get-agent/test/support/FrameTypes.ts | 2 +- .../test/support/MockDocument.ts | 2 +- .../test/support/MockFDC3Server.ts | 2 +- .../test/support/responses/CurrentChannel.ts | 2 +- .../test/support/responses/FindIntent.ts | 2 +- .../test/support/responses/Handshake.ts | 2 +- .../test/support/responses/RaiseIntent.ts | 2 +- .../test/support/responses/UserChannels.ts | 2 +- packages/fdc3-get-agent/tsconfig.json | 2 +- .../.eslintrc.json | 0 .../jest.config.js | 0 .../{fdc3-core => fdc3-standard}/package.json | 2 +- .../src/api/AppIdentifier.ts | 0 .../src/api/AppIntent.ts | 0 .../src/api/AppMetadata.ts | 0 .../src/api/Channel.ts | 0 .../src/api/ContextMetadata.ts | 0 .../src/api/DesktopAgent.ts | 0 .../src/api/DesktopAgentIdentifier.ts | 0 .../src/api/DisplayMetadata.ts | 0 .../src/api/Errors.ts | 0 .../src/api/Events.ts | 0 .../src/api/GetAgent.ts | 0 .../src/api/Icon.ts | 0 .../src/api/Image.ts | 0 .../src/api/ImplementationMetadata.ts | 0 .../src/api/IntentMetadata.ts | 0 .../src/api/IntentResolution.ts | 0 .../src/api/Listener.ts | 0 .../src/api/Methods.ts | 0 .../src/api/PrivateChannel.ts | 0 .../src/api/RecommendedChannels.ts | 0 .../src/api/Types.ts | 0 .../specification/appd.schema.json | 0 .../examples/application/fdc3-workbench.json | 0 .../examples/application/myApplication.json | 0 .../app-directory/specification/test/index.js | 0 .../specification/test/package-lock.json | 0 .../specification/test/package.json | 0 .../src/context/ContextType.ts | 0 .../{fdc3-core => fdc3-standard}/src/index.ts | 0 .../src/intents/Intents.ts | 0 .../src/intents/standard intents.json | 0 .../src/internal/contextConfiguration.ts | 0 .../src/internal/intentConfiguration.ts | 0 .../src/internal/typeHelpers.ts | 0 .../src/protocols/bcp.ts | 2 +- .../src/protocols/wcp.ts | 2 +- .../src/ui/ChannelSelector.ts | 0 .../src/ui/Connectable.ts | 0 .../src/ui/IntentResolver.ts | 0 .../test/ContextTypes.test.ts | 0 .../test/Methods.test.ts | 0 .../test/window.test.ts | 0 .../tsconfig.json | 0 packages/testing/package.json | 2 +- packages/testing/src/agent/index.ts | 4 +- packages/testing/tsconfig.json | 2 +- toolbox/fdc3-for-web/da-server/package.json | 4 +- .../da-server/src/BasicFDC3Server.ts | 2 +- .../fdc3-for-web/da-server/src/FDC3Server.ts | 2 +- .../da-server/src/ServerContext.ts | 4 +- .../src/handlers/BroadcastHandler.ts | 4 +- .../da-server/src/handlers/IntentHandler.ts | 2 +- .../da-server/src/handlers/OpenHandler.ts | 2 +- .../da-server/src/handlers/support.ts | 2 +- .../step-definitions/app-channel.steps.ts | 2 +- .../test/step-definitions/broadcast.steps.ts | 2 +- .../test/step-definitions/intents.steps.ts | 2 +- .../step-definitions/private-channel.steps.ts | 2 +- .../test/step-definitions/start-app.steps.ts | 2 +- .../step-definitions/user-channel.steps.ts | 2 +- toolbox/fdc3-for-web/da-server/tsconfig.json | 2 +- toolbox/fdc3-for-web/demo/package.json | 2 +- .../demo/src/client/da/dummy-desktop-agent.ts | 2 +- .../demo/src/client/ui/channel-selector.ts | 2 +- .../demo/src/client/ui/intent-resolver.ts | 2 +- toolbox/fdc3-for-web/demo/tsconfig.json | 4 +- toolbox/fdc3-workbench/src/utility/Fdc3Api.ts | 2 +- 140 files changed, 215 insertions(+), 402 deletions(-) rename packages/{fdc3-core => fdc3-standard}/.eslintrc.json (100%) rename packages/{fdc3-core => fdc3-standard}/jest.config.js (100%) rename packages/{fdc3-core => fdc3-standard}/package.json (97%) rename packages/{fdc3-core => fdc3-standard}/src/api/AppIdentifier.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/AppIntent.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/AppMetadata.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/Channel.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/ContextMetadata.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/DesktopAgent.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/DesktopAgentIdentifier.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/DisplayMetadata.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/Errors.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/Events.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/GetAgent.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/Icon.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/Image.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/ImplementationMetadata.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/IntentMetadata.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/IntentResolution.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/Listener.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/Methods.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/PrivateChannel.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/RecommendedChannels.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/api/Types.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/app-directory/specification/appd.schema.json (100%) rename packages/{fdc3-core => fdc3-standard}/src/app-directory/specification/examples/application/fdc3-workbench.json (100%) rename packages/{fdc3-core => fdc3-standard}/src/app-directory/specification/examples/application/myApplication.json (100%) rename packages/{fdc3-core => fdc3-standard}/src/app-directory/specification/test/index.js (100%) rename packages/{fdc3-core => fdc3-standard}/src/app-directory/specification/test/package-lock.json (100%) rename packages/{fdc3-core => fdc3-standard}/src/app-directory/specification/test/package.json (100%) rename packages/{fdc3-core => fdc3-standard}/src/context/ContextType.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/index.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/intents/Intents.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/intents/standard intents.json (100%) rename packages/{fdc3-core => fdc3-standard}/src/internal/contextConfiguration.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/internal/intentConfiguration.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/internal/typeHelpers.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/protocols/bcp.ts (99%) rename packages/{fdc3-core => fdc3-standard}/src/protocols/wcp.ts (94%) rename packages/{fdc3-core => fdc3-standard}/src/ui/ChannelSelector.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/ui/Connectable.ts (100%) rename packages/{fdc3-core => fdc3-standard}/src/ui/IntentResolver.ts (100%) rename packages/{fdc3-core => fdc3-standard}/test/ContextTypes.test.ts (100%) rename packages/{fdc3-core => fdc3-standard}/test/Methods.test.ts (100%) rename packages/{fdc3-core => fdc3-standard}/test/window.test.ts (100%) rename packages/{fdc3-core => fdc3-standard}/tsconfig.json (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c98e7d11..a3d19af45 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,12 +2,11 @@ name: Node.js CI Build # Controls when the workflow will run on any branch on: - push: pull_request: # Define the jobs for this workflow jobs: - test: + build: runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8cef96f15..827377a53 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,6 @@ name: Node.js CI Test # Controls when the workflow will run on any branch on: - push: pull_request: # Define the jobs for this workflow diff --git a/package-lock.json b/package-lock.json index b26a8f44f..3ea5077fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,11 @@ "license": "Apache-2.0", "workspaces": [ "packages/fdc3-schema", - "packages/fdc3-core", + "packages/fdc3-standard", "packages/testing", "packages/da-proxy", "toolbox/fdc3-for-web/da-server", - "packages/client", + "packages/fdc3-get-agent", "toolbox/fdc3-for-web/demo", "toolbox/fdc3-workbench" ], @@ -3392,10 +3392,6 @@ "jsep": "^0.4.0||^1.0.0" } }, - "node_modules/@kite9/fdc3-get-agent": { - "resolved": "packages/client", - "link": true - }, "node_modules/@kite9/da-proxy": { "resolved": "packages/da-proxy", "link": true @@ -3424,14 +3420,18 @@ "@kite9/fdc3": "2.2.0-beta.6" } }, - "node_modules/@kite9/fdc3-core": { - "resolved": "packages/fdc3-core", + "node_modules/@kite9/fdc3-get-agent": { + "resolved": "packages/fdc3-get-agent", "link": true }, "node_modules/@kite9/fdc3-schema": { "resolved": "packages/fdc3-schema", "link": true }, + "node_modules/@kite9/fdc3-standard": { + "resolved": "packages/fdc3-standard", + "link": true + }, "node_modules/@kite9/testing": { "resolved": "packages/testing", "link": true @@ -6186,11 +6186,6 @@ "version": "1.0.1", "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==" }, - "node_modules/compare-versions": { - "version": "3.6.0", - "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==", - "dev": true - }, "node_modules/concat-map": { "version": "0.0.1", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" @@ -8112,27 +8107,6 @@ "url": "https://github.com/avajs/find-cache-dir?sponsor=1" } }, - "node_modules/find-cache-dir/node_modules/find-up": { - "version": "4.1.0", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-cache-dir/node_modules/locate-path": { - "version": "5.0.0", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/find-cache-dir/node_modules/make-dir": { "version": "3.1.0", "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", @@ -8146,39 +8120,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/find-cache-dir/node_modules/p-limit": { - "version": "2.3.0", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/find-cache-dir/node_modules/p-locate": { - "version": "4.1.0", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-cache-dir/node_modules/pkg-dir": { - "version": "4.2.0", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dependencies": { - "find-up": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/find-cache-dir/node_modules/semver": { "version": "6.3.1", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", @@ -8211,20 +8152,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/find-versions": { - "version": "4.0.0", - "integrity": "sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ==", - "dev": true, - "dependencies": { - "semver-regex": "^3.1.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/flat-cache": { "version": "3.2.0", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", @@ -8859,74 +8786,6 @@ "node": ">=10.17.0" } }, - "node_modules/husky": { - "version": "4.3.8", - "integrity": "sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "chalk": "^4.0.0", - "ci-info": "^2.0.0", - "compare-versions": "^3.6.0", - "cosmiconfig": "^7.0.0", - "find-versions": "^4.0.0", - "opencollective-postinstall": "^2.0.2", - "pkg-dir": "^5.0.0", - "please-upgrade-node": "^3.2.0", - "slash": "^3.0.0", - "which-pm-runs": "^1.0.0" - }, - "bin": { - "husky-run": "bin/run.js", - "husky-upgrade": "lib/upgrader/bin.js" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/husky" - } - }, - "node_modules/husky/node_modules/cosmiconfig": { - "version": "7.1.0", - "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", - "dev": true, - "dependencies": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/husky/node_modules/path-type": { - "version": "4.0.0", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/husky/node_modules/slash": { - "version": "3.0.0", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/husky/node_modules/yaml": { - "version": "1.10.2", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, "node_modules/hyphenate-style-name": { "version": "1.1.0", "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==", @@ -9005,65 +8864,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/import-local/node_modules/find-up": { - "version": "4.1.0", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/import-local/node_modules/locate-path": { - "version": "5.0.0", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/import-local/node_modules/p-limit": { - "version": "2.3.0", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/import-local/node_modules/p-locate": { - "version": "4.1.0", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/import-local/node_modules/pkg-dir": { - "version": "4.2.0", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "dependencies": { - "find-up": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/imurmurhash": { "version": "0.1.4", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", @@ -12123,14 +11923,6 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/opencollective-postinstall": { - "version": "2.0.3", - "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==", - "dev": true, - "bin": { - "opencollective-postinstall": "index.js" - } - }, "node_modules/optionator": { "version": "0.9.4", "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", @@ -12436,14 +12228,57 @@ } }, "node_modules/pkg-dir": { + "version": "4.2.0", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "4.1.0", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { "version": "5.0.0", - "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==", - "dev": true, + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dependencies": { - "find-up": "^5.0.0" + "p-locate": "^4.1.0" }, "engines": { - "node": ">=10" + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "2.3.0", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "4.1.0", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" } }, "node_modules/please-upgrade-node": { @@ -13617,17 +13452,6 @@ "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", "dev": true }, - "node_modules/semver-regex": { - "version": "3.1.4", - "integrity": "sha512-6IiqeZNgq01qGf0TId0t3NvKzSvUsjcpdEO3AQNeIjR6A2+ckTnQlDpl4qu1bjRv0RzN3FP9hzFmws3lKqRWkA==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/send": { "version": "0.19.0", "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", @@ -15929,14 +15753,6 @@ "version": "2.0.1", "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==" }, - "node_modules/which-pm-runs": { - "version": "1.1.0", - "integrity": "sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/which-typed-array": { "version": "1.1.15", "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", @@ -16220,33 +16036,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "packages/client": { - "version": "2.2.0-beta.6", - "dependencies": { - "@kite9/da-proxy": "2.2.0-beta.6", - "@kite9/fdc3-core": "2.2.0-beta.6", - "@types/uuid": "^10.0.0", - "uuid": "^9.0.1" - }, - "devDependencies": { - "@cucumber/cucumber": "10.3.1", - "@kite9/da-server": "2.2.0-beta.6", - "@kite9/testing": "2.2.0-beta.6", - "@types/node": "^20.14.11", - "@types/wtfnode": "^0.7.3", - "expect": "^29.7.0", - "jsonpath-plus": "^9.0.0", - "nyc": "15.1.0", - "rimraf": "^6.0.1", - "tsx": "^4.7.1", - "typescript": "^5.3.2", - "wtfnode": "^0.9.3" - } - }, "packages/da-proxy": { "version": "2.2.0-beta.6", "dependencies": { - "@kite9/fdc3-core": "2.2.0-beta.6" + "@kite9/fdc3-standard": "2.2.0-beta.6" }, "devDependencies": { "@cucumber/cucumber": "10.3.1", @@ -16276,12 +16069,32 @@ "uuid": "^9.0.1" } }, - "packages/fdc3-core": { + "packages/fdc3-get-agent": { "version": "2.2.0-beta.6", - "license": "Apache-2.0", "dependencies": { - "@kite9/fdc3-schema": "2.2.0-beta.6" + "@kite9/da-proxy": "2.2.0-beta.6", + "@kite9/fdc3-standard": "2.2.0-beta.6", + "@types/uuid": "^10.0.0", + "uuid": "^9.0.1" }, + "devDependencies": { + "@cucumber/cucumber": "10.3.1", + "@kite9/da-server": "2.2.0-beta.6", + "@kite9/testing": "2.2.0-beta.6", + "@types/node": "^20.14.11", + "@types/wtfnode": "^0.7.3", + "expect": "^29.7.0", + "jsonpath-plus": "^9.0.0", + "nyc": "15.1.0", + "rimraf": "^6.0.1", + "tsx": "^4.7.1", + "typescript": "^5.3.2", + "wtfnode": "^0.9.3" + } + }, + "packages/fdc3-schema": { + "version": "2.2.0-beta.6", + "license": "Apache-2.0", "devDependencies": { "@types/jest": "29.5.12", "@typescript-eslint/eslint-plugin": "7.1.1", @@ -16290,11 +16103,6 @@ "eslint-config-prettier": "9.1.0", "eslint-plugin-jest": "27.9.0", "eslint-plugin-jsx-a11y": "^6.8.0", - "husky": "^4.3.0", - "jest": "29.7.0", - "jest-environment-jsdom": "29.7.0", - "jest-mock-extended": "3.0.5", - "prettier": "3.2.5", "quicktype": "23.0.78", "rimraf": "^6.0.1", "ts-jest": "29.1.2", @@ -16302,9 +16110,12 @@ "typescript": "^5.3.2" } }, - "packages/fdc3-schema": { + "packages/fdc3-standard": { "version": "2.2.0-beta.6", "license": "Apache-2.0", + "dependencies": { + "@kite9/fdc3-schema": "2.2.0-beta.6" + }, "devDependencies": { "@types/jest": "29.5.12", "@typescript-eslint/eslint-plugin": "7.1.1", @@ -16313,6 +16124,10 @@ "eslint-config-prettier": "9.1.0", "eslint-plugin-jest": "27.9.0", "eslint-plugin-jsx-a11y": "^6.8.0", + "jest": "29.7.0", + "jest-environment-jsdom": "29.7.0", + "jest-mock-extended": "3.0.5", + "prettier": "3.2.5", "quicktype": "23.0.78", "rimraf": "^6.0.1", "ts-jest": "29.1.2", @@ -16326,7 +16141,7 @@ "@cucumber/cucumber": "10.3.1", "@cucumber/html-formatter": "11.0.4", "@cucumber/pretty-formatter": "1.0.1", - "@kite9/fdc3-core": "2.2.0-beta.6", + "@kite9/fdc3-standard": "2.2.0-beta.6", "@types/expect": "24.3.0", "@types/lodash": "4.14.167", "@types/node": "^20.14.11", @@ -16355,7 +16170,7 @@ "toolbox/fdc3-for-web/da-server": { "version": "2.2.0-beta.6", "dependencies": { - "@kite9/fdc3-core": "2.2.0-beta.6", + "@kite9/fdc3-standard": "2.2.0-beta.6", "@types/uuid": "^10.0.0", "uuid": "^9.0.1" }, @@ -16391,9 +16206,9 @@ "toolbox/fdc3-for-web/demo": { "version": "2.2.0-beta.6", "dependencies": { - "@kite9/fdc3-get-agent": "2.2.0-beta.6", "@kite9/da-server": "2.2.0-beta.6", - "@kite9/fdc3-core": "2.2.0-beta.6", + "@kite9/fdc3-get-agent": "2.2.0-beta.6", + "@kite9/fdc3-standard": "2.2.0-beta.6", "@types/uuid": "^10.0.0", "@types/ws": "^8.5.10", "express": "^4.18.3", @@ -16419,8 +16234,8 @@ "@apidevtools/json-schema-ref-parser": "^9.0.9", "@fontsource/roboto": "^4.4.5", "@fontsource/source-code-pro": "^4.5.0", - "@kite9/fdc3-get-agent": "2.2.0-beta.6", "@kite9/fdc3": "2.2.0-beta.6", + "@kite9/fdc3-get-agent": "2.2.0-beta.6", "@material-ui/core": "^4.11.4", "@material-ui/icons": "^4.11.2", "@material-ui/lab": "^4.0.0-alpha.59", @@ -16455,4 +16270,4 @@ } } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 83653ca62..a296a719e 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ ], "workspaces": [ "packages/fdc3-schema", - "packages/fdc3-core", + "packages/fdc3-standard", "packages/testing", "packages/da-proxy", "toolbox/fdc3-for-web/da-server", diff --git a/packages/da-proxy/package.json b/packages/da-proxy/package.json index d992cb691..d77fa7b25 100644 --- a/packages/da-proxy/package.json +++ b/packages/da-proxy/package.json @@ -12,7 +12,7 @@ "clean": "rimraf dist; rimraf cucumber-report.html; rimraf coverage; rimraf .nyc_output; rimraf node_modules" }, "dependencies": { - "@kite9/fdc3-core": "2.2.0-beta.6" + "@kite9/fdc3-standard": "2.2.0-beta.6" }, "devDependencies": { "@cucumber/cucumber": "10.3.1", diff --git a/packages/da-proxy/src/BasicDesktopAgent.ts b/packages/da-proxy/src/BasicDesktopAgent.ts index bcc6fc198..654920788 100644 --- a/packages/da-proxy/src/BasicDesktopAgent.ts +++ b/packages/da-proxy/src/BasicDesktopAgent.ts @@ -1,9 +1,9 @@ -import { AppIdentifier, AppMetadata, Context, ContextHandler, DesktopAgent, EventHandler, FDC3EventType, ImplementationMetadata, IntentHandler, IntentResolution, Listener } from "@kite9/fdc3-core"; +import { AppIdentifier, AppMetadata, Context, ContextHandler, DesktopAgent, EventHandler, FDC3EventType, ImplementationMetadata, IntentHandler, IntentResolution, Listener } from "@kite9/fdc3-standard"; import { ChannelSupport } from "./channels/ChannelSupport"; import { AppSupport } from "./apps/AppSupport"; import { IntentSupport } from "./intents/IntentSupport"; import { HandshakeSupport } from "./handshake/HandshakeSupport"; -import { DesktopAgentDetails, Connectable } from "@kite9/fdc3-core" +import { DesktopAgentDetails, Connectable } from "@kite9/fdc3-standard" /** * This splits out the functionality of the desktop agent into * app, channels and intents concerns. diff --git a/packages/da-proxy/src/Messaging.ts b/packages/da-proxy/src/Messaging.ts index c07b9d4e4..d27f6811b 100644 --- a/packages/da-proxy/src/Messaging.ts +++ b/packages/da-proxy/src/Messaging.ts @@ -1,4 +1,4 @@ -import { Connectable, AppIdentifier, ImplementationMetadata } from "@kite9/fdc3-core"; +import { Connectable, AppIdentifier, ImplementationMetadata } from "@kite9/fdc3-standard"; import { RegisterableListener } from "./listeners/RegisterableListener"; export interface Messaging extends Connectable { diff --git a/packages/da-proxy/src/apps/AppSupport.ts b/packages/da-proxy/src/apps/AppSupport.ts index 02e836355..771b04c1d 100644 --- a/packages/da-proxy/src/apps/AppSupport.ts +++ b/packages/da-proxy/src/apps/AppSupport.ts @@ -1,4 +1,4 @@ -import { AppIdentifier, AppMetadata, Context } from "@kite9/fdc3-core"; +import { AppIdentifier, AppMetadata, Context } from "@kite9/fdc3-standard"; export interface AppSupport { diff --git a/packages/da-proxy/src/apps/DefaultAppSupport.ts b/packages/da-proxy/src/apps/DefaultAppSupport.ts index 7a97689c1..b74a9b445 100644 --- a/packages/da-proxy/src/apps/DefaultAppSupport.ts +++ b/packages/da-proxy/src/apps/DefaultAppSupport.ts @@ -1,7 +1,7 @@ -import { AppIdentifier, AppMetadata, Context } from "@kite9/fdc3-core"; +import { AppIdentifier, AppMetadata, Context } from "@kite9/fdc3-standard"; import { AppSupport } from "./AppSupport"; import { Messaging } from "../Messaging"; -import { FindInstancesRequest, GetAppMetadataResponse, FindInstancesResponse, GetAppMetadataRequest, OpenRequest } from "@kite9/fdc3-core" +import { FindInstancesRequest, GetAppMetadataResponse, FindInstancesResponse, GetAppMetadataRequest, OpenRequest } from "@kite9/fdc3-standard" export class DefaultAppSupport implements AppSupport { diff --git a/packages/da-proxy/src/channels/ChannelSupport.ts b/packages/da-proxy/src/channels/ChannelSupport.ts index f28bc1a02..36591b668 100644 --- a/packages/da-proxy/src/channels/ChannelSupport.ts +++ b/packages/da-proxy/src/channels/ChannelSupport.ts @@ -1,4 +1,4 @@ -import { Channel, ContextHandler, Listener, PrivateChannel } from "@kite9/fdc3-core" +import { Channel, ContextHandler, Listener, PrivateChannel } from "@kite9/fdc3-standard" export interface ChannelSupport { diff --git a/packages/da-proxy/src/channels/DefaultChannel.ts b/packages/da-proxy/src/channels/DefaultChannel.ts index 6e423707a..1ce0ff262 100644 --- a/packages/da-proxy/src/channels/DefaultChannel.ts +++ b/packages/da-proxy/src/channels/DefaultChannel.ts @@ -1,7 +1,7 @@ -import { Context, ContextHandler, DisplayMetadata, Listener, Channel } from "@kite9/fdc3-core" +import { Context, ContextHandler, DisplayMetadata, Listener, Channel } from "@kite9/fdc3-standard" import { Messaging } from "../Messaging" import { DefaultContextListener } from "../listeners/DefaultContextListener" -import { BroadcastRequest, BroadcastResponse, GetCurrentContextResponse, GetCurrentContextRequest } from '@kite9/fdc3-core' +import { BroadcastRequest, BroadcastResponse, GetCurrentContextResponse, GetCurrentContextRequest } from '@kite9/fdc3-standard' export class DefaultChannel implements Channel { diff --git a/packages/da-proxy/src/channels/DefaultChannelSupport.ts b/packages/da-proxy/src/channels/DefaultChannelSupport.ts index 26afcfa88..3912940ea 100644 --- a/packages/da-proxy/src/channels/DefaultChannelSupport.ts +++ b/packages/da-proxy/src/channels/DefaultChannelSupport.ts @@ -1,4 +1,4 @@ -import { Channel, ContextHandler, Listener, PrivateChannel } from "@kite9/fdc3-core"; +import { Channel, ContextHandler, Listener, PrivateChannel } from "@kite9/fdc3-standard"; import { Messaging } from "../Messaging"; import { ChannelSupport } from "./ChannelSupport"; import { DefaultPrivateChannel } from "./DefaultPrivateChannel"; @@ -15,7 +15,7 @@ import { JoinUserChannelResponse, JoinUserChannelRequest, GetCurrentChannelResponse, GetCurrentChannelRequest, LeaveCurrentChannelRequest, LeaveCurrentChannelResponse, -} from "@kite9/fdc3-core"; +} from "@kite9/fdc3-standard"; import { FollowingContextListener } from "../listeners/FollowingContextListener"; diff --git a/packages/da-proxy/src/channels/DefaultPrivateChannel.ts b/packages/da-proxy/src/channels/DefaultPrivateChannel.ts index 42ced65a8..8e3e2da0a 100644 --- a/packages/da-proxy/src/channels/DefaultPrivateChannel.ts +++ b/packages/da-proxy/src/channels/DefaultPrivateChannel.ts @@ -1,9 +1,9 @@ -import { ContextHandler, Listener, PrivateChannel } from "@kite9/fdc3-core"; +import { ContextHandler, Listener, PrivateChannel } from "@kite9/fdc3-standard"; import { DefaultChannel } from "./DefaultChannel"; import { Messaging } from "../Messaging"; import { PrivateChannelEventListenerType, PrivateChannelEventListenerVoid } from "../listeners/PrivateChannelEventListener"; import { DefaultContextListener } from "../listeners/DefaultContextListener"; -import { PrivateChannelDisconnectRequest, PrivateChannelDisconnectResponse } from '@kite9/fdc3-core' +import { PrivateChannelDisconnectRequest, PrivateChannelDisconnectResponse } from '@kite9/fdc3-standard' export class DefaultPrivateChannel extends DefaultChannel implements PrivateChannel { diff --git a/packages/da-proxy/src/handshake/DefaultHandshakeSupport.ts b/packages/da-proxy/src/handshake/DefaultHandshakeSupport.ts index 0c9879a45..8d4724180 100644 --- a/packages/da-proxy/src/handshake/DefaultHandshakeSupport.ts +++ b/packages/da-proxy/src/handshake/DefaultHandshakeSupport.ts @@ -1,6 +1,6 @@ import { Messaging } from "../Messaging"; import { HandshakeSupport } from "./HandshakeSupport"; -import { ImplementationMetadata } from "@kite9/fdc3-core"; +import { ImplementationMetadata } from "@kite9/fdc3-standard"; /** * This will possibly eventually need extending to allow for auth handshaking. diff --git a/packages/da-proxy/src/handshake/HandshakeSupport.ts b/packages/da-proxy/src/handshake/HandshakeSupport.ts index b2ecf1183..913f08273 100644 --- a/packages/da-proxy/src/handshake/HandshakeSupport.ts +++ b/packages/da-proxy/src/handshake/HandshakeSupport.ts @@ -1,4 +1,4 @@ -import { ImplementationMetadata, Connectable } from "@kite9/fdc3-core" +import { ImplementationMetadata, Connectable } from "@kite9/fdc3-standard" /** * Handles messaging around connection and disconnection of the proxy diff --git a/packages/da-proxy/src/index.ts b/packages/da-proxy/src/index.ts index 758868847..052dae607 100644 --- a/packages/da-proxy/src/index.ts +++ b/packages/da-proxy/src/index.ts @@ -16,7 +16,7 @@ import { AppSupport } from "./apps/AppSupport"; import { HandshakeSupport } from "./handshake/HandshakeSupport"; import { DefaultHandshakeSupport } from "./handshake/DefaultHandshakeSupport"; -import { Connectable } from "@kite9/fdc3-core"; +import { Connectable } from "@kite9/fdc3-standard"; export { type Messaging, diff --git a/packages/da-proxy/src/intents/DefaultIntentResolution.ts b/packages/da-proxy/src/intents/DefaultIntentResolution.ts index 8f3e62922..29036616a 100644 --- a/packages/da-proxy/src/intents/DefaultIntentResolution.ts +++ b/packages/da-proxy/src/intents/DefaultIntentResolution.ts @@ -1,4 +1,4 @@ -import { AppIdentifier, IntentResolution, IntentResult } from "@kite9/fdc3-core"; +import { AppIdentifier, IntentResolution, IntentResult } from "@kite9/fdc3-standard"; import { Messaging } from "../Messaging"; export class DefaultIntentResolution implements IntentResolution { diff --git a/packages/da-proxy/src/intents/DefaultIntentSupport.ts b/packages/da-proxy/src/intents/DefaultIntentSupport.ts index f40bb280a..164fc3ddf 100644 --- a/packages/da-proxy/src/intents/DefaultIntentSupport.ts +++ b/packages/da-proxy/src/intents/DefaultIntentSupport.ts @@ -1,12 +1,12 @@ -import { Context, AppIntent, AppIdentifier, IntentResolution, IntentHandler, Listener, ResolveError, IntentResult } from "@kite9/fdc3-core"; +import { Context, AppIntent, AppIdentifier, IntentResolution, IntentHandler, Listener, ResolveError, IntentResult } from "@kite9/fdc3-standard"; import { IntentSupport } from "./IntentSupport"; import { Messaging } from "../Messaging"; import { DefaultIntentResolution } from "./DefaultIntentResolution"; import { DefaultIntentListener } from "../listeners/DefaultIntentListener"; -import { IntentResolutionChoice, IntentResolver, RaiseIntentForContextRequest, RaiseIntentForContextResponse } from "@kite9/fdc3-core"; +import { IntentResolutionChoice, IntentResolver, RaiseIntentForContextRequest, RaiseIntentForContextResponse } from "@kite9/fdc3-standard"; import { DefaultChannel } from "../channels/DefaultChannel"; import { DefaultPrivateChannel } from "../channels/DefaultPrivateChannel"; -import { FindIntentRequest, FindIntentResponse, AddContextListenerRequestMeta, FindIntentsByContextRequest, FindIntentsByContextResponse, RaiseIntentRequest, RaiseIntentResultResponse, RaiseIntentResponse } from "@kite9/fdc3-core" +import { FindIntentRequest, FindIntentResponse, AddContextListenerRequestMeta, FindIntentsByContextRequest, FindIntentsByContextResponse, RaiseIntentRequest, RaiseIntentResultResponse, RaiseIntentResponse } from "@kite9/fdc3-standard" function convertIntentResult(m: RaiseIntentResultResponse, messaging: Messaging): Promise { const result = m.payload.intentResult!! diff --git a/packages/da-proxy/src/intents/IntentSupport.ts b/packages/da-proxy/src/intents/IntentSupport.ts index 9d336fa04..381c5d7ee 100644 --- a/packages/da-proxy/src/intents/IntentSupport.ts +++ b/packages/da-proxy/src/intents/IntentSupport.ts @@ -1,4 +1,4 @@ -import { AppIdentifier, AppIntent, Context, IntentHandler, IntentResolution, Listener } from "@kite9/fdc3-core"; +import { AppIdentifier, AppIntent, Context, IntentHandler, IntentResolution, Listener } from "@kite9/fdc3-standard"; export interface IntentSupport { diff --git a/packages/da-proxy/src/listeners/DefaultContextListener.ts b/packages/da-proxy/src/listeners/DefaultContextListener.ts index 7153d604c..722aba80f 100644 --- a/packages/da-proxy/src/listeners/DefaultContextListener.ts +++ b/packages/da-proxy/src/listeners/DefaultContextListener.ts @@ -1,7 +1,7 @@ -import { ContextHandler, Channel } from "@kite9/fdc3-core"; +import { ContextHandler, Channel } from "@kite9/fdc3-standard"; import { Messaging } from "../Messaging"; import { AbstractListener } from "./AbstractListener"; -import { BroadcastEvent } from "@kite9/fdc3-core"; +import { BroadcastEvent } from "@kite9/fdc3-standard"; import { FollowingContextListener } from "./FollowingContextListener"; export class DefaultContextListener extends AbstractListener implements FollowingContextListener { diff --git a/packages/da-proxy/src/listeners/DefaultIntentListener.ts b/packages/da-proxy/src/listeners/DefaultIntentListener.ts index f230898f9..92fc85cbb 100644 --- a/packages/da-proxy/src/listeners/DefaultIntentListener.ts +++ b/packages/da-proxy/src/listeners/DefaultIntentListener.ts @@ -1,7 +1,7 @@ -import { IntentHandler, IntentResult, AppIdentifier, Context } from "@kite9/fdc3-core"; +import { IntentHandler, IntentResult, AppIdentifier, Context } from "@kite9/fdc3-standard"; import { Messaging } from "../Messaging"; import { AbstractListener } from "./AbstractListener"; -import { RaiseIntentResponse, IntentResultResponse, FluffyIntentResult as BridgeIntentResult, IntentEvent, IntentResultRequest } from "@kite9/fdc3-core" +import { RaiseIntentResponse, IntentResultResponse, FluffyIntentResult as BridgeIntentResult, IntentEvent, IntentResultRequest } from "@kite9/fdc3-standard" export class DefaultIntentListener extends AbstractListener { diff --git a/packages/da-proxy/src/listeners/PrivateChannelEventListener.ts b/packages/da-proxy/src/listeners/PrivateChannelEventListener.ts index 687b20998..1cef31c02 100644 --- a/packages/da-proxy/src/listeners/PrivateChannelEventListener.ts +++ b/packages/da-proxy/src/listeners/PrivateChannelEventListener.ts @@ -1,6 +1,6 @@ import { Messaging } from "../Messaging" import { AbstractListener } from "./AbstractListener" -import { BroadcastEvent } from "@kite9/fdc3-core" +import { BroadcastEvent } from "@kite9/fdc3-standard" type EVENT_TYPES_WITH_TYPE_HANDLER = "onAddContextListener" | "onUnsubscribe" export type EVENT_TYPES = EVENT_TYPES_WITH_TYPE_HANDLER | "onDisconnect" diff --git a/packages/da-proxy/src/listeners/RegisterableListener.ts b/packages/da-proxy/src/listeners/RegisterableListener.ts index ec5936261..c3e425915 100644 --- a/packages/da-proxy/src/listeners/RegisterableListener.ts +++ b/packages/da-proxy/src/listeners/RegisterableListener.ts @@ -1,4 +1,4 @@ -import { Listener } from "@kite9/fdc3-core"; +import { Listener } from "@kite9/fdc3-standard"; /** * Extends the basic concept of FDC3 listeners to include lifecycle methods. diff --git a/packages/da-proxy/src/messaging/AbstractMessaging.ts b/packages/da-proxy/src/messaging/AbstractMessaging.ts index 105464d70..79a182c6f 100644 --- a/packages/da-proxy/src/messaging/AbstractMessaging.ts +++ b/packages/da-proxy/src/messaging/AbstractMessaging.ts @@ -1,7 +1,7 @@ -import { AppIdentifier, ImplementationMetadata } from "@kite9/fdc3-core"; +import { AppIdentifier, ImplementationMetadata } from "@kite9/fdc3-standard"; import { Messaging } from "../Messaging"; import { RegisterableListener } from "../listeners/RegisterableListener"; -import { GetAgentParams, WebConnectionProtocol4ValidateAppIdentity, WebConnectionProtocol5ValidateAppIdentitySuccessResponse } from "@kite9/fdc3-core"; +import { GetAgentParams, WebConnectionProtocol4ValidateAppIdentity, WebConnectionProtocol5ValidateAppIdentitySuccessResponse } from "@kite9/fdc3-standard"; export abstract class AbstractMessaging implements Messaging { diff --git a/packages/da-proxy/test/step-definitions/channels.steps.ts b/packages/da-proxy/test/step-definitions/channels.steps.ts index 2e2f81313..4c1502a26 100644 --- a/packages/da-proxy/test/step-definitions/channels.steps.ts +++ b/packages/da-proxy/test/step-definitions/channels.steps.ts @@ -2,7 +2,7 @@ import { DataTable, Given, Then, When } from '@cucumber/cucumber' import { Context } from '@kite9/fdc3'; import { handleResolve, matchData } from '@kite9/testing'; import { CustomWorld } from '../world/index'; -import { BroadcastEvent, AgentResponseMessage, ResponseMessageType, PrivateChannelOnUnsubscribeEvent, PrivateChannelOnDisconnectEvent } from '@kite9/fdc3-core' +import { BroadcastEvent, AgentResponseMessage, ResponseMessageType, PrivateChannelOnUnsubscribeEvent, PrivateChannelOnDisconnectEvent } from '@kite9/fdc3-standard' import { CHANNEL_STATE } from '@kite9/testing'; const contextMap: Record = { diff --git a/packages/da-proxy/test/step-definitions/intents.steps.ts b/packages/da-proxy/test/step-definitions/intents.steps.ts index 9e302033e..58271f4f7 100644 --- a/packages/da-proxy/test/step-definitions/intents.steps.ts +++ b/packages/da-proxy/test/step-definitions/intents.steps.ts @@ -1,7 +1,7 @@ import { Given } from '@cucumber/cucumber' import { CustomWorld } from '../world/index'; import { handleResolve } from '@kite9/testing'; -import { IntentEvent } from '@kite9/fdc3-core'; +import { IntentEvent } from '@kite9/fdc3-standard'; import { Context, ContextMetadata } from '@kite9/fdc3'; Given("app {string}", function (this: CustomWorld, appStr: string) { diff --git a/packages/da-proxy/test/support/TestMessaging.ts b/packages/da-proxy/test/support/TestMessaging.ts index 87bc4db88..b19727dd9 100644 --- a/packages/da-proxy/test/support/TestMessaging.ts +++ b/packages/da-proxy/test/support/TestMessaging.ts @@ -1,5 +1,5 @@ -import { AppIdentifier, Context, Channel } from "@kite9/fdc3-core"; -import { AppRequestMessage, WebConnectionProtocol5ValidateAppIdentitySuccessResponse } from "@kite9/fdc3-core"; +import { AppIdentifier, Context, Channel } from "@kite9/fdc3-standard"; +import { AppRequestMessage, WebConnectionProtocol5ValidateAppIdentitySuccessResponse } from "@kite9/fdc3-standard"; import { v4 as uuidv4 } from 'uuid' import { AbstractMessaging } from "../../src/messaging/AbstractMessaging"; import { RegisterableListener } from "../../src/listeners/RegisterableListener"; diff --git a/packages/da-proxy/test/support/responses/ChannelState.ts b/packages/da-proxy/test/support/responses/ChannelState.ts index efc837ff2..a9a3252e0 100644 --- a/packages/da-proxy/test/support/responses/ChannelState.ts +++ b/packages/da-proxy/test/support/responses/ChannelState.ts @@ -8,7 +8,7 @@ import { GetCurrentContextRequest, GetCurrentContextResponse, BroadcastRequest, BroadcastResponse, AgentResponseMessage, Context -} from "@kite9/fdc3-core"; +} from "@kite9/fdc3-standard"; import { createResponseMeta } from "./support"; import { v4 as uuidv4 } from 'uuid' diff --git a/packages/da-proxy/test/support/responses/CreatePrivateChannel.ts b/packages/da-proxy/test/support/responses/CreatePrivateChannel.ts index b11dc4817..ebc5f7944 100644 --- a/packages/da-proxy/test/support/responses/CreatePrivateChannel.ts +++ b/packages/da-proxy/test/support/responses/CreatePrivateChannel.ts @@ -1,5 +1,5 @@ import { AutomaticResponse, TestMessaging } from "../TestMessaging"; -import { CreatePrivateChannelRequest, CreatePrivateChannelResponse } from "@kite9/fdc3-core"; +import { CreatePrivateChannelRequest, CreatePrivateChannelResponse } from "@kite9/fdc3-standard"; import { createResponseMeta } from "./support"; import { v4 as uuidv4 } from 'uuid' diff --git a/packages/da-proxy/test/support/responses/DisconnectPrivateChannel.ts b/packages/da-proxy/test/support/responses/DisconnectPrivateChannel.ts index a4e605af4..a295debd7 100644 --- a/packages/da-proxy/test/support/responses/DisconnectPrivateChannel.ts +++ b/packages/da-proxy/test/support/responses/DisconnectPrivateChannel.ts @@ -1,5 +1,5 @@ import { AutomaticResponse, TestMessaging } from "../TestMessaging"; -import { PrivateChannelDisconnectRequest, PrivateChannelDisconnectResponse } from "@kite9/fdc3-core"; +import { PrivateChannelDisconnectRequest, PrivateChannelDisconnectResponse } from "@kite9/fdc3-standard"; import { createResponseMeta } from "./support"; export class DisconnectPrivateChannel implements AutomaticResponse { diff --git a/packages/da-proxy/test/support/responses/FindInstances.ts b/packages/da-proxy/test/support/responses/FindInstances.ts index 9a02cab66..a1f72eef7 100644 --- a/packages/da-proxy/test/support/responses/FindInstances.ts +++ b/packages/da-proxy/test/support/responses/FindInstances.ts @@ -1,5 +1,5 @@ import { AutomaticResponse, TestMessaging } from "../TestMessaging"; -import { FindInstancesRequest, FindInstancesResponse } from "@kite9/fdc3-core"; +import { FindInstancesRequest, FindInstancesResponse } from "@kite9/fdc3-standard"; export class FindInstances implements AutomaticResponse { diff --git a/packages/da-proxy/test/support/responses/FindIntent.ts b/packages/da-proxy/test/support/responses/FindIntent.ts index b25fa502f..ffbf04dd2 100644 --- a/packages/da-proxy/test/support/responses/FindIntent.ts +++ b/packages/da-proxy/test/support/responses/FindIntent.ts @@ -1,5 +1,5 @@ import { AutomaticResponse, IntentDetail, TestMessaging, intentDetailMatches } from "../TestMessaging"; -import { FindIntentRequest, FindIntentResponse } from "@kite9/fdc3-core"; +import { FindIntentRequest, FindIntentResponse } from "@kite9/fdc3-standard"; export class FindIntent implements AutomaticResponse { diff --git a/packages/da-proxy/test/support/responses/FindIntentByContext.ts b/packages/da-proxy/test/support/responses/FindIntentByContext.ts index 2fad7333b..f4a33a6fc 100644 --- a/packages/da-proxy/test/support/responses/FindIntentByContext.ts +++ b/packages/da-proxy/test/support/responses/FindIntentByContext.ts @@ -1,5 +1,5 @@ import { AutomaticResponse, IntentDetail, TestMessaging, intentDetailMatches } from "../TestMessaging"; -import { FindIntentsByContextRequest, FindIntentsByContextResponse } from "@kite9/fdc3-core"; +import { FindIntentsByContextRequest, FindIntentsByContextResponse } from "@kite9/fdc3-standard"; export class FindIntentByContext implements AutomaticResponse { diff --git a/packages/da-proxy/test/support/responses/GetAppMetadata.ts b/packages/da-proxy/test/support/responses/GetAppMetadata.ts index cd8f79dbd..6f0dfcf9c 100644 --- a/packages/da-proxy/test/support/responses/GetAppMetadata.ts +++ b/packages/da-proxy/test/support/responses/GetAppMetadata.ts @@ -1,5 +1,5 @@ import { AutomaticResponse, TestMessaging } from "../TestMessaging"; -import { GetAppMetadataRequest, GetAppMetadataResponse } from "@kite9/fdc3-core"; +import { GetAppMetadataRequest, GetAppMetadataResponse } from "@kite9/fdc3-standard"; export class GetAppMetadata implements AutomaticResponse { diff --git a/packages/da-proxy/test/support/responses/GetOrCreateChannel.ts b/packages/da-proxy/test/support/responses/GetOrCreateChannel.ts index 1356b363a..cbb231402 100644 --- a/packages/da-proxy/test/support/responses/GetOrCreateChannel.ts +++ b/packages/da-proxy/test/support/responses/GetOrCreateChannel.ts @@ -1,6 +1,6 @@ import { AutomaticResponse, TestMessaging } from "../TestMessaging"; -import { ChannelError } from "@kite9/fdc3-core"; -import { GetOrCreateChannelRequest, GetOrCreateChannelResponse } from "@kite9/fdc3-core" +import { ChannelError } from "@kite9/fdc3-standard"; +import { GetOrCreateChannelRequest, GetOrCreateChannelResponse } from "@kite9/fdc3-standard" import { createResponseMeta } from "./support"; type ChannelType = { [channelId: string]: 'user' | 'app' | 'private' } diff --git a/packages/da-proxy/test/support/responses/GetUserChannels.ts b/packages/da-proxy/test/support/responses/GetUserChannels.ts index 2cb7d7985..08bf6bcf1 100644 --- a/packages/da-proxy/test/support/responses/GetUserChannels.ts +++ b/packages/da-proxy/test/support/responses/GetUserChannels.ts @@ -1,5 +1,5 @@ import { AutomaticResponse, TestMessaging } from "../TestMessaging"; -import { GetUserChannelsRequest, GetUserChannelsResponse, Channel } from "@kite9/fdc3-core"; +import { GetUserChannelsRequest, GetUserChannelsResponse, Channel } from "@kite9/fdc3-standard"; import { createResponseMeta } from "./support"; export class GetUserChannels implements AutomaticResponse { diff --git a/packages/da-proxy/test/support/responses/Handshake.ts b/packages/da-proxy/test/support/responses/Handshake.ts index 7a3de51e6..ea44ab1a2 100644 --- a/packages/da-proxy/test/support/responses/Handshake.ts +++ b/packages/da-proxy/test/support/responses/Handshake.ts @@ -1,5 +1,5 @@ import { AutomaticResponse, TestMessaging } from "../TestMessaging"; -import { WebConnectionProtocol4ValidateAppIdentity, WebConnectionProtocol5ValidateAppIdentitySuccessResponse } from "@kite9/fdc3-core"; +import { WebConnectionProtocol4ValidateAppIdentity, WebConnectionProtocol5ValidateAppIdentitySuccessResponse } from "@kite9/fdc3-standard"; export class Handshake implements AutomaticResponse { diff --git a/packages/da-proxy/test/support/responses/IntentResult.ts b/packages/da-proxy/test/support/responses/IntentResult.ts index 46da60d68..566615105 100644 --- a/packages/da-proxy/test/support/responses/IntentResult.ts +++ b/packages/da-proxy/test/support/responses/IntentResult.ts @@ -1,5 +1,5 @@ import { AutomaticResponse, TestMessaging } from "../TestMessaging"; -import { IntentResultRequest, IntentResultResponse } from "@kite9/fdc3-core"; +import { IntentResultRequest, IntentResultResponse } from "@kite9/fdc3-standard"; export class IntentResult implements AutomaticResponse { diff --git a/packages/da-proxy/test/support/responses/Open.ts b/packages/da-proxy/test/support/responses/Open.ts index 1a2ccf701..91872bb79 100644 --- a/packages/da-proxy/test/support/responses/Open.ts +++ b/packages/da-proxy/test/support/responses/Open.ts @@ -1,5 +1,5 @@ import { AutomaticResponse, IntentDetail, TestMessaging } from "../TestMessaging"; -import { OpenRequest, OpenResponse } from "@kite9/fdc3-core"; +import { OpenRequest, OpenResponse } from "@kite9/fdc3-standard"; export class Open implements AutomaticResponse { diff --git a/packages/da-proxy/test/support/responses/RaiseIntent.ts b/packages/da-proxy/test/support/responses/RaiseIntent.ts index 2b4601aa5..c9509e2ee 100644 --- a/packages/da-proxy/test/support/responses/RaiseIntent.ts +++ b/packages/da-proxy/test/support/responses/RaiseIntent.ts @@ -1,6 +1,6 @@ import { AutomaticResponse, IntentDetail, intentDetailMatches, TestMessaging } from "../TestMessaging"; -import { RaiseIntentRequest, RaiseIntentResponse, RaiseIntentResultResponse } from "@kite9/fdc3-core"; -import { ResolveError } from "@kite9/fdc3-core" +import { RaiseIntentRequest, RaiseIntentResponse, RaiseIntentResultResponse } from "@kite9/fdc3-standard"; +import { ResolveError } from "@kite9/fdc3-standard" export class RaiseIntent implements AutomaticResponse { diff --git a/packages/da-proxy/test/support/responses/RaiseIntentForContext.ts b/packages/da-proxy/test/support/responses/RaiseIntentForContext.ts index e2c0fa6d4..a6c21236d 100644 --- a/packages/da-proxy/test/support/responses/RaiseIntentForContext.ts +++ b/packages/da-proxy/test/support/responses/RaiseIntentForContext.ts @@ -1,6 +1,6 @@ import { AutomaticResponse, IntentDetail, intentDetailMatches, TestMessaging } from "../TestMessaging"; -import { RaiseIntentForContextRequest, RaiseIntentForContextResponse, RaiseIntentResultResponse } from "@kite9/fdc3-core"; -import { ResolveError } from "@kite9/fdc3-core" +import { RaiseIntentForContextRequest, RaiseIntentForContextResponse, RaiseIntentResultResponse } from "@kite9/fdc3-standard"; +import { ResolveError } from "@kite9/fdc3-standard" export class RaiseIntentForContext implements AutomaticResponse { diff --git a/packages/da-proxy/test/support/responses/support.ts b/packages/da-proxy/test/support/responses/support.ts index 6327d3846..5a361e804 100644 --- a/packages/da-proxy/test/support/responses/support.ts +++ b/packages/da-proxy/test/support/responses/support.ts @@ -1,4 +1,4 @@ -import { AppRequestMessageMeta, AgentResponseMessageMeta } from '@kite9/fdc3-core' +import { AppRequestMessageMeta, AgentResponseMessageMeta } from '@kite9/fdc3-standard' import { v4 as uuidv4 } from 'uuid' export function createResponseMeta(m: AppRequestMessageMeta): AgentResponseMessageMeta { diff --git a/packages/da-proxy/tsconfig.json b/packages/da-proxy/tsconfig.json index 946b19f42..dfba07e10 100644 --- a/packages/da-proxy/tsconfig.json +++ b/packages/da-proxy/tsconfig.json @@ -16,7 +16,7 @@ ], "references": [ { - "path": "../fdc3-core" + "path": "../fdc3-standard" }, { "path": "../testing" diff --git a/packages/fdc3-all/package.json b/packages/fdc3-all/package.json index f174c51c2..cc2288172 100644 --- a/packages/fdc3-all/package.json +++ b/packages/fdc3-all/package.json @@ -1,5 +1,5 @@ { - "name": "@kite9/fdc3-core", + "name": "@kite9/fdc3-standard", "version": "2.2.0-beta.6", "author": "Fintech Open Source Foundation (FINOS)", "homepage": "https://fdc3.finos.org", diff --git a/packages/fdc3-get-agent/package.json b/packages/fdc3-get-agent/package.json index 6bce122b5..4d82239ad 100644 --- a/packages/fdc3-get-agent/package.json +++ b/packages/fdc3-get-agent/package.json @@ -12,7 +12,7 @@ "clean": "rimraf dist; rimraf cucumber-report.html; rimraf coverage; rimraf .nyc_output; rimraf node_modules" }, "dependencies": { - "@kite9/fdc3-core": "2.2.0-beta.6", + "@kite9/fdc3-standard": "2.2.0-beta.6", "@kite9/da-proxy": "2.2.0-beta.6", "@types/uuid": "^10.0.0", "uuid": "^9.0.1" diff --git a/packages/fdc3-get-agent/src/apps/NoopAppSupport.ts b/packages/fdc3-get-agent/src/apps/NoopAppSupport.ts index f54c99006..76088de8b 100644 --- a/packages/fdc3-get-agent/src/apps/NoopAppSupport.ts +++ b/packages/fdc3-get-agent/src/apps/NoopAppSupport.ts @@ -1,4 +1,4 @@ -import { AppIdentifier, AppMetadata } from "@kite9/fdc3-core"; +import { AppIdentifier, AppMetadata } from "@kite9/fdc3-standard"; import { Messaging } from "@kite9/da-proxy"; import { DefaultAppSupport } from "@kite9/da-proxy"; diff --git a/packages/fdc3-get-agent/src/index.ts b/packages/fdc3-get-agent/src/index.ts index 4b201ab5a..bae3848f3 100644 --- a/packages/fdc3-get-agent/src/index.ts +++ b/packages/fdc3-get-agent/src/index.ts @@ -1,4 +1,4 @@ -import { DesktopAgent, getAgent as getAgentType, GetAgentParams } from '@kite9/fdc3-core' +import { DesktopAgent, getAgent as getAgentType, GetAgentParams } from '@kite9/fdc3-standard' import { ElectronEventLoader } from './strategies/ElectronEventLoader' import { handleWindowProxy, PostMessageLoader } from './strategies/PostMessageLoader' import { TimeoutLoader } from './strategies/TimeoutLoader' diff --git a/packages/fdc3-get-agent/src/messaging/AbstractWebMessaging.ts b/packages/fdc3-get-agent/src/messaging/AbstractWebMessaging.ts index d7c22eb13..8c1daac23 100644 --- a/packages/fdc3-get-agent/src/messaging/AbstractWebMessaging.ts +++ b/packages/fdc3-get-agent/src/messaging/AbstractWebMessaging.ts @@ -1,4 +1,4 @@ -import { DesktopAgentDetails, WebDesktopAgentType, GetAgentParams, WebConnectionProtocol5ValidateAppIdentitySuccessResponse } from "@kite9/fdc3-core"; +import { DesktopAgentDetails, WebDesktopAgentType, GetAgentParams, WebConnectionProtocol5ValidateAppIdentitySuccessResponse } from "@kite9/fdc3-standard"; import { RegisterableListener, AbstractMessaging } from "@kite9/da-proxy"; export const DESKTOP_AGENT_SESSION_STORAGE_DETAILS_KEY = "fdc3-desktop-agent-details" diff --git a/packages/fdc3-get-agent/src/messaging/MessagePortMessaging.ts b/packages/fdc3-get-agent/src/messaging/MessagePortMessaging.ts index 146d264af..cc62eaa8f 100644 --- a/packages/fdc3-get-agent/src/messaging/MessagePortMessaging.ts +++ b/packages/fdc3-get-agent/src/messaging/MessagePortMessaging.ts @@ -1,6 +1,6 @@ import { AbstractWebMessaging } from './AbstractWebMessaging' import { RegisterableListener } from "@kite9/da-proxy" -import { GetAgentParams, WebConnectionProtocol3Handshake } from "@kite9/fdc3-core" +import { GetAgentParams, WebConnectionProtocol3Handshake } from "@kite9/fdc3-standard" import { v4 as uuidv4 } from "uuid" /** diff --git a/packages/fdc3-get-agent/src/messaging/message-port.ts b/packages/fdc3-get-agent/src/messaging/message-port.ts index bd489743a..991e41a6b 100644 --- a/packages/fdc3-get-agent/src/messaging/message-port.ts +++ b/packages/fdc3-get-agent/src/messaging/message-port.ts @@ -1,11 +1,11 @@ -import { DesktopAgent } from "@kite9/fdc3-core"; +import { DesktopAgent } from "@kite9/fdc3-standard"; import { BasicDesktopAgent, DefaultChannelSupport, DefaultAppSupport, DefaultIntentSupport, DefaultHandshakeSupport, ChannelSupport } from "@kite9/da-proxy"; import { ConnectionDetails, MessagePortMessaging } from "./MessagePortMessaging"; import { DefaultDesktopAgentIntentResolver } from "../ui/DefaultDesktopAgentIntentResolver"; import { DefaultDesktopAgentChannelSelector } from "../ui/DefaultDesktopAgentChannelSelector"; import { NullIntentResolver } from "../ui/NullIIntentResolver"; import { NullChannelSelector } from "../ui/NullChannelSelector"; -import { ChannelSelector } from "@kite9/fdc3-core"; +import { ChannelSelector } from "@kite9/fdc3-standard"; /** * Given a message port, constructs a desktop agent to communicate via that. diff --git a/packages/fdc3-get-agent/src/strategies/ElectronEventLoader.ts b/packages/fdc3-get-agent/src/strategies/ElectronEventLoader.ts index bdf5418d6..ad5a7983b 100644 --- a/packages/fdc3-get-agent/src/strategies/ElectronEventLoader.ts +++ b/packages/fdc3-get-agent/src/strategies/ElectronEventLoader.ts @@ -1,5 +1,5 @@ -import { DesktopAgent } from "@kite9/fdc3-core"; -import { GetAgentParams } from "@kite9/fdc3-core"; +import { DesktopAgent } from "@kite9/fdc3-standard"; +import { GetAgentParams } from "@kite9/fdc3-standard"; import { Loader } from "./Loader"; diff --git a/packages/fdc3-get-agent/src/strategies/Loader.ts b/packages/fdc3-get-agent/src/strategies/Loader.ts index 9093471c9..8c105a7d9 100644 --- a/packages/fdc3-get-agent/src/strategies/Loader.ts +++ b/packages/fdc3-get-agent/src/strategies/Loader.ts @@ -1,5 +1,5 @@ -import { DesktopAgent } from "@kite9/fdc3-core" -import { GetAgentParams } from "@kite9/fdc3-core" +import { DesktopAgent } from "@kite9/fdc3-standard" +import { GetAgentParams } from "@kite9/fdc3-standard" /** * Represents the common interface for a loading strategy diff --git a/packages/fdc3-get-agent/src/strategies/PostMessageLoader.ts b/packages/fdc3-get-agent/src/strategies/PostMessageLoader.ts index 9915b71d6..97e4fa0d6 100644 --- a/packages/fdc3-get-agent/src/strategies/PostMessageLoader.ts +++ b/packages/fdc3-get-agent/src/strategies/PostMessageLoader.ts @@ -1,4 +1,4 @@ -import { DesktopAgent, GetAgentParams, WebConnectionProtocol1Hello, WebConnectionProtocol2LoadURL, WebConnectionProtocol3Handshake } from '@kite9/fdc3-core' +import { DesktopAgent, GetAgentParams, WebConnectionProtocol1Hello, WebConnectionProtocol2LoadURL, WebConnectionProtocol3Handshake } from '@kite9/fdc3-standard' import { FDC3_VERSION } from '..'; import { createDesktopAgentAPI } from '../messaging/message-port'; import { v4 as uuidv4 } from "uuid" diff --git a/packages/fdc3-get-agent/src/strategies/TimeoutLoader.ts b/packages/fdc3-get-agent/src/strategies/TimeoutLoader.ts index 4ecd2f181..32dfb939b 100644 --- a/packages/fdc3-get-agent/src/strategies/TimeoutLoader.ts +++ b/packages/fdc3-get-agent/src/strategies/TimeoutLoader.ts @@ -1,4 +1,4 @@ -import { DesktopAgent, GetAgentParams } from "@kite9/fdc3-core"; +import { DesktopAgent, GetAgentParams } from "@kite9/fdc3-standard"; import { Loader } from "./Loader"; diff --git a/packages/fdc3-get-agent/src/strategies/post-message.ts b/packages/fdc3-get-agent/src/strategies/post-message.ts index 9915b71d6..97e4fa0d6 100644 --- a/packages/fdc3-get-agent/src/strategies/post-message.ts +++ b/packages/fdc3-get-agent/src/strategies/post-message.ts @@ -1,4 +1,4 @@ -import { DesktopAgent, GetAgentParams, WebConnectionProtocol1Hello, WebConnectionProtocol2LoadURL, WebConnectionProtocol3Handshake } from '@kite9/fdc3-core' +import { DesktopAgent, GetAgentParams, WebConnectionProtocol1Hello, WebConnectionProtocol2LoadURL, WebConnectionProtocol3Handshake } from '@kite9/fdc3-standard' import { FDC3_VERSION } from '..'; import { createDesktopAgentAPI } from '../messaging/message-port'; import { v4 as uuidv4 } from "uuid" diff --git a/packages/fdc3-get-agent/src/ui/AbstractUIComponent.ts b/packages/fdc3-get-agent/src/ui/AbstractUIComponent.ts index 2054fad33..6861ad073 100644 --- a/packages/fdc3-get-agent/src/ui/AbstractUIComponent.ts +++ b/packages/fdc3-get-agent/src/ui/AbstractUIComponent.ts @@ -1,4 +1,4 @@ -import { Connectable } from "@kite9/fdc3-core"; +import { Connectable } from "@kite9/fdc3-standard"; export interface CSSPositioning { [key: string]: string } diff --git a/packages/fdc3-get-agent/src/ui/DefaultDesktopAgentChannelSelector.ts b/packages/fdc3-get-agent/src/ui/DefaultDesktopAgentChannelSelector.ts index d6909b53d..be1a58035 100644 --- a/packages/fdc3-get-agent/src/ui/DefaultDesktopAgentChannelSelector.ts +++ b/packages/fdc3-get-agent/src/ui/DefaultDesktopAgentChannelSelector.ts @@ -1,5 +1,5 @@ -import { Channel, IframeChannels, IframeChannelSelected } from "@kite9/fdc3-core"; -import { ChannelSelector } from "@kite9/fdc3-core" +import { Channel, IframeChannels, IframeChannelSelected } from "@kite9/fdc3-standard"; +import { ChannelSelector } from "@kite9/fdc3-standard" import { AbstractUIComponent } from "./AbstractUIComponent"; diff --git a/packages/fdc3-get-agent/src/ui/DefaultDesktopAgentIntentResolver.ts b/packages/fdc3-get-agent/src/ui/DefaultDesktopAgentIntentResolver.ts index a159bc437..a95848831 100644 --- a/packages/fdc3-get-agent/src/ui/DefaultDesktopAgentIntentResolver.ts +++ b/packages/fdc3-get-agent/src/ui/DefaultDesktopAgentIntentResolver.ts @@ -1,5 +1,5 @@ -import { AppIntent, IframeResolveAction, Context, IframeResolve } from "@kite9/fdc3-core"; -import { IntentResolver, IntentResolutionChoice } from '@kite9/fdc3-core' +import { AppIntent, IframeResolveAction, Context, IframeResolve } from "@kite9/fdc3-standard"; +import { IntentResolver, IntentResolutionChoice } from '@kite9/fdc3-standard' import { AbstractUIComponent } from "./AbstractUIComponent"; /** diff --git a/packages/fdc3-get-agent/src/ui/NullChannelSelector.ts b/packages/fdc3-get-agent/src/ui/NullChannelSelector.ts index ecc81a8dc..11dc9cb20 100644 --- a/packages/fdc3-get-agent/src/ui/NullChannelSelector.ts +++ b/packages/fdc3-get-agent/src/ui/NullChannelSelector.ts @@ -1,6 +1,6 @@ -import { Channel, } from "@kite9/fdc3-core"; -import { Connectable } from "@kite9/fdc3-core"; -import { ChannelSelector } from "@kite9/fdc3-core"; +import { Channel, } from "@kite9/fdc3-standard"; +import { Connectable } from "@kite9/fdc3-standard"; +import { ChannelSelector } from "@kite9/fdc3-standard"; export class NullChannelSelector implements ChannelSelector, Connectable { diff --git a/packages/fdc3-get-agent/src/ui/NullIIntentResolver.ts b/packages/fdc3-get-agent/src/ui/NullIIntentResolver.ts index cac952160..bbb46e566 100644 --- a/packages/fdc3-get-agent/src/ui/NullIIntentResolver.ts +++ b/packages/fdc3-get-agent/src/ui/NullIIntentResolver.ts @@ -1,5 +1,5 @@ -import { AppIntent, Context } from "@kite9/fdc3-core"; -import { IntentResolver, IntentResolutionChoice } from "@kite9/fdc3-core"; +import { AppIntent, Context } from "@kite9/fdc3-standard"; +import { IntentResolver, IntentResolutionChoice } from "@kite9/fdc3-standard"; export class NullIntentResolver implements IntentResolver { diff --git a/packages/fdc3-get-agent/test/step-definitions/desktop-agent.steps.ts b/packages/fdc3-get-agent/test/step-definitions/desktop-agent.steps.ts index 8bb24d4e7..46481c22d 100644 --- a/packages/fdc3-get-agent/test/step-definitions/desktop-agent.steps.ts +++ b/packages/fdc3-get-agent/test/step-definitions/desktop-agent.steps.ts @@ -3,7 +3,7 @@ import { CustomWorld } from '../world'; import { handleResolve, setupGenericSteps } from '@kite9/testing'; import { MockDocument, MockWindow } from '../support/MockDocument'; import { getAgent } from '../../src'; -import { DesktopAgentDetails, GetAgentParams, WebDesktopAgentType } from '@kite9/fdc3-core'; +import { DesktopAgentDetails, GetAgentParams, WebDesktopAgentType } from '@kite9/fdc3-standard'; import { dummyInstanceId, EMBED_URL, MockFDC3Server } from '../support/MockFDC3Server'; import { MockStorage } from '../support/MockStorage'; import { DesktopAgent, ImplementationMetadata } from '@kite9/fdc3'; diff --git a/packages/fdc3-get-agent/test/support/FrameTypes.ts b/packages/fdc3-get-agent/test/support/FrameTypes.ts index 9cbea7dcc..e5e42155d 100644 --- a/packages/fdc3-get-agent/test/support/FrameTypes.ts +++ b/packages/fdc3-get-agent/test/support/FrameTypes.ts @@ -1,4 +1,4 @@ -import { IframeHello, WebConnectionProtocol3Handshake } from "@kite9/fdc3-core" +import { IframeHello, WebConnectionProtocol3Handshake } from "@kite9/fdc3-standard" import { CustomWorld } from "../world" import { MockWindow } from "./MockDocument" import { CHANNEL_SELECTOR_URL, EMBED_URL, INTENT_RESPOLVER_URL } from "./MockFDC3Server" diff --git a/packages/fdc3-get-agent/test/support/MockDocument.ts b/packages/fdc3-get-agent/test/support/MockDocument.ts index 958f34f9d..5ea67b403 100644 --- a/packages/fdc3-get-agent/test/support/MockDocument.ts +++ b/packages/fdc3-get-agent/test/support/MockDocument.ts @@ -1,6 +1,6 @@ import { CHANNEL_SELECTOR_URL, EMBED_URL, INTENT_RESPOLVER_URL } from "./MockFDC3Server" import { CustomWorld } from "../world" -import { DesktopAgent } from "@kite9/fdc3-core" +import { DesktopAgent } from "@kite9/fdc3-standard" import { handleChannelSelectorComms, handleEmbeddedIframeComms, handleIntentResolverComms } from "./FrameTypes" class MockCSSStyleDeclaration { diff --git a/packages/fdc3-get-agent/test/support/MockFDC3Server.ts b/packages/fdc3-get-agent/test/support/MockFDC3Server.ts index dc786e3c5..35de9699e 100644 --- a/packages/fdc3-get-agent/test/support/MockFDC3Server.ts +++ b/packages/fdc3-get-agent/test/support/MockFDC3Server.ts @@ -1,5 +1,5 @@ import { FDC3Server } from "@kite9/da-server" -import { AppRequestMessage, WebConnectionProtocol2LoadURL, WebConnectionProtocol3Handshake } from "@kite9/fdc3-core" +import { AppRequestMessage, WebConnectionProtocol2LoadURL, WebConnectionProtocol3Handshake } from "@kite9/fdc3-standard" import { TestServerContext } from "./TestServerContext" import { MockWindow } from "./MockDocument" import { AutomaticResponse } from "./responses/AutomaticResponses" diff --git a/packages/fdc3-get-agent/test/support/responses/CurrentChannel.ts b/packages/fdc3-get-agent/test/support/responses/CurrentChannel.ts index c82c8d3db..015b04db6 100644 --- a/packages/fdc3-get-agent/test/support/responses/CurrentChannel.ts +++ b/packages/fdc3-get-agent/test/support/responses/CurrentChannel.ts @@ -1,4 +1,4 @@ -import { GetCurrentChannelRequest, GetCurrentChannelResponse } from "@kite9/fdc3-core"; +import { GetCurrentChannelRequest, GetCurrentChannelResponse } from "@kite9/fdc3-standard"; import { TestServerContext } from "../TestServerContext"; import { InstanceID } from "@kite9/da-server"; import { AutomaticResponse } from "./AutomaticResponses"; diff --git a/packages/fdc3-get-agent/test/support/responses/FindIntent.ts b/packages/fdc3-get-agent/test/support/responses/FindIntent.ts index 1a2b5732c..5e66997c0 100644 --- a/packages/fdc3-get-agent/test/support/responses/FindIntent.ts +++ b/packages/fdc3-get-agent/test/support/responses/FindIntent.ts @@ -1,4 +1,4 @@ -import { FindIntentRequest, FindIntentResponse } from "@kite9/fdc3-core"; +import { FindIntentRequest, FindIntentResponse } from "@kite9/fdc3-standard"; import { TestServerContext } from "../TestServerContext"; import { InstanceID } from "@kite9/da-server"; import { AutomaticResponse } from "./AutomaticResponses"; diff --git a/packages/fdc3-get-agent/test/support/responses/Handshake.ts b/packages/fdc3-get-agent/test/support/responses/Handshake.ts index 73aa06432..bf25178e7 100644 --- a/packages/fdc3-get-agent/test/support/responses/Handshake.ts +++ b/packages/fdc3-get-agent/test/support/responses/Handshake.ts @@ -2,7 +2,7 @@ import { TestServerContext } from "../TestServerContext"; import { InstanceID } from "@kite9/da-server"; import { AutomaticResponse } from "./AutomaticResponses"; -import { WebConnectionProtocol4ValidateAppIdentity, WebConnectionProtocol5ValidateAppIdentityFailedResponse, WebConnectionProtocol5ValidateAppIdentitySuccessResponse } from "@kite9/fdc3-core"; +import { WebConnectionProtocol4ValidateAppIdentity, WebConnectionProtocol5ValidateAppIdentityFailedResponse, WebConnectionProtocol5ValidateAppIdentitySuccessResponse } from "@kite9/fdc3-standard"; export const BAD_INSTANCE_ID = "BAD_INSTANCE" diff --git a/packages/fdc3-get-agent/test/support/responses/RaiseIntent.ts b/packages/fdc3-get-agent/test/support/responses/RaiseIntent.ts index 7e65c5d44..03b777567 100644 --- a/packages/fdc3-get-agent/test/support/responses/RaiseIntent.ts +++ b/packages/fdc3-get-agent/test/support/responses/RaiseIntent.ts @@ -1,4 +1,4 @@ -import { RaiseIntentRequest, RaiseIntentResponse } from "@kite9/fdc3-core"; +import { RaiseIntentRequest, RaiseIntentResponse } from "@kite9/fdc3-standard"; import { TestServerContext } from "../TestServerContext"; import { InstanceID } from "@kite9/da-server"; import { AutomaticResponse } from "./AutomaticResponses"; diff --git a/packages/fdc3-get-agent/test/support/responses/UserChannels.ts b/packages/fdc3-get-agent/test/support/responses/UserChannels.ts index 32998e876..976167056 100644 --- a/packages/fdc3-get-agent/test/support/responses/UserChannels.ts +++ b/packages/fdc3-get-agent/test/support/responses/UserChannels.ts @@ -1,7 +1,7 @@ import { TestServerContext } from "../TestServerContext"; import { InstanceID } from "@kite9/da-server"; import { AutomaticResponse } from "./AutomaticResponses"; -import { GetUserChannelsRequest, GetUserChannelsResponse } from "@kite9/fdc3-core"; +import { GetUserChannelsRequest, GetUserChannelsResponse } from "@kite9/fdc3-standard"; export const USER_CHANNELS = [ { diff --git a/packages/fdc3-get-agent/tsconfig.json b/packages/fdc3-get-agent/tsconfig.json index 924f412f7..5db9c91a5 100644 --- a/packages/fdc3-get-agent/tsconfig.json +++ b/packages/fdc3-get-agent/tsconfig.json @@ -15,7 +15,7 @@ "path": "../da-proxy" }, { - "path": "../fdc3-core" + "path": "../fdc3-standard" }, { "path": "../testing" diff --git a/packages/fdc3-core/.eslintrc.json b/packages/fdc3-standard/.eslintrc.json similarity index 100% rename from packages/fdc3-core/.eslintrc.json rename to packages/fdc3-standard/.eslintrc.json diff --git a/packages/fdc3-core/jest.config.js b/packages/fdc3-standard/jest.config.js similarity index 100% rename from packages/fdc3-core/jest.config.js rename to packages/fdc3-standard/jest.config.js diff --git a/packages/fdc3-core/package.json b/packages/fdc3-standard/package.json similarity index 97% rename from packages/fdc3-core/package.json rename to packages/fdc3-standard/package.json index 9e8af62d7..3fd37a0ba 100644 --- a/packages/fdc3-core/package.json +++ b/packages/fdc3-standard/package.json @@ -1,5 +1,5 @@ { - "name": "@kite9/fdc3-core", + "name": "@kite9/fdc3-standard", "version": "2.2.0-beta.6", "author": "Fintech Open Source Foundation (FINOS)", "homepage": "https://fdc3.finos.org", diff --git a/packages/fdc3-core/src/api/AppIdentifier.ts b/packages/fdc3-standard/src/api/AppIdentifier.ts similarity index 100% rename from packages/fdc3-core/src/api/AppIdentifier.ts rename to packages/fdc3-standard/src/api/AppIdentifier.ts diff --git a/packages/fdc3-core/src/api/AppIntent.ts b/packages/fdc3-standard/src/api/AppIntent.ts similarity index 100% rename from packages/fdc3-core/src/api/AppIntent.ts rename to packages/fdc3-standard/src/api/AppIntent.ts diff --git a/packages/fdc3-core/src/api/AppMetadata.ts b/packages/fdc3-standard/src/api/AppMetadata.ts similarity index 100% rename from packages/fdc3-core/src/api/AppMetadata.ts rename to packages/fdc3-standard/src/api/AppMetadata.ts diff --git a/packages/fdc3-core/src/api/Channel.ts b/packages/fdc3-standard/src/api/Channel.ts similarity index 100% rename from packages/fdc3-core/src/api/Channel.ts rename to packages/fdc3-standard/src/api/Channel.ts diff --git a/packages/fdc3-core/src/api/ContextMetadata.ts b/packages/fdc3-standard/src/api/ContextMetadata.ts similarity index 100% rename from packages/fdc3-core/src/api/ContextMetadata.ts rename to packages/fdc3-standard/src/api/ContextMetadata.ts diff --git a/packages/fdc3-core/src/api/DesktopAgent.ts b/packages/fdc3-standard/src/api/DesktopAgent.ts similarity index 100% rename from packages/fdc3-core/src/api/DesktopAgent.ts rename to packages/fdc3-standard/src/api/DesktopAgent.ts diff --git a/packages/fdc3-core/src/api/DesktopAgentIdentifier.ts b/packages/fdc3-standard/src/api/DesktopAgentIdentifier.ts similarity index 100% rename from packages/fdc3-core/src/api/DesktopAgentIdentifier.ts rename to packages/fdc3-standard/src/api/DesktopAgentIdentifier.ts diff --git a/packages/fdc3-core/src/api/DisplayMetadata.ts b/packages/fdc3-standard/src/api/DisplayMetadata.ts similarity index 100% rename from packages/fdc3-core/src/api/DisplayMetadata.ts rename to packages/fdc3-standard/src/api/DisplayMetadata.ts diff --git a/packages/fdc3-core/src/api/Errors.ts b/packages/fdc3-standard/src/api/Errors.ts similarity index 100% rename from packages/fdc3-core/src/api/Errors.ts rename to packages/fdc3-standard/src/api/Errors.ts diff --git a/packages/fdc3-core/src/api/Events.ts b/packages/fdc3-standard/src/api/Events.ts similarity index 100% rename from packages/fdc3-core/src/api/Events.ts rename to packages/fdc3-standard/src/api/Events.ts diff --git a/packages/fdc3-core/src/api/GetAgent.ts b/packages/fdc3-standard/src/api/GetAgent.ts similarity index 100% rename from packages/fdc3-core/src/api/GetAgent.ts rename to packages/fdc3-standard/src/api/GetAgent.ts diff --git a/packages/fdc3-core/src/api/Icon.ts b/packages/fdc3-standard/src/api/Icon.ts similarity index 100% rename from packages/fdc3-core/src/api/Icon.ts rename to packages/fdc3-standard/src/api/Icon.ts diff --git a/packages/fdc3-core/src/api/Image.ts b/packages/fdc3-standard/src/api/Image.ts similarity index 100% rename from packages/fdc3-core/src/api/Image.ts rename to packages/fdc3-standard/src/api/Image.ts diff --git a/packages/fdc3-core/src/api/ImplementationMetadata.ts b/packages/fdc3-standard/src/api/ImplementationMetadata.ts similarity index 100% rename from packages/fdc3-core/src/api/ImplementationMetadata.ts rename to packages/fdc3-standard/src/api/ImplementationMetadata.ts diff --git a/packages/fdc3-core/src/api/IntentMetadata.ts b/packages/fdc3-standard/src/api/IntentMetadata.ts similarity index 100% rename from packages/fdc3-core/src/api/IntentMetadata.ts rename to packages/fdc3-standard/src/api/IntentMetadata.ts diff --git a/packages/fdc3-core/src/api/IntentResolution.ts b/packages/fdc3-standard/src/api/IntentResolution.ts similarity index 100% rename from packages/fdc3-core/src/api/IntentResolution.ts rename to packages/fdc3-standard/src/api/IntentResolution.ts diff --git a/packages/fdc3-core/src/api/Listener.ts b/packages/fdc3-standard/src/api/Listener.ts similarity index 100% rename from packages/fdc3-core/src/api/Listener.ts rename to packages/fdc3-standard/src/api/Listener.ts diff --git a/packages/fdc3-core/src/api/Methods.ts b/packages/fdc3-standard/src/api/Methods.ts similarity index 100% rename from packages/fdc3-core/src/api/Methods.ts rename to packages/fdc3-standard/src/api/Methods.ts diff --git a/packages/fdc3-core/src/api/PrivateChannel.ts b/packages/fdc3-standard/src/api/PrivateChannel.ts similarity index 100% rename from packages/fdc3-core/src/api/PrivateChannel.ts rename to packages/fdc3-standard/src/api/PrivateChannel.ts diff --git a/packages/fdc3-core/src/api/RecommendedChannels.ts b/packages/fdc3-standard/src/api/RecommendedChannels.ts similarity index 100% rename from packages/fdc3-core/src/api/RecommendedChannels.ts rename to packages/fdc3-standard/src/api/RecommendedChannels.ts diff --git a/packages/fdc3-core/src/api/Types.ts b/packages/fdc3-standard/src/api/Types.ts similarity index 100% rename from packages/fdc3-core/src/api/Types.ts rename to packages/fdc3-standard/src/api/Types.ts diff --git a/packages/fdc3-core/src/app-directory/specification/appd.schema.json b/packages/fdc3-standard/src/app-directory/specification/appd.schema.json similarity index 100% rename from packages/fdc3-core/src/app-directory/specification/appd.schema.json rename to packages/fdc3-standard/src/app-directory/specification/appd.schema.json diff --git a/packages/fdc3-core/src/app-directory/specification/examples/application/fdc3-workbench.json b/packages/fdc3-standard/src/app-directory/specification/examples/application/fdc3-workbench.json similarity index 100% rename from packages/fdc3-core/src/app-directory/specification/examples/application/fdc3-workbench.json rename to packages/fdc3-standard/src/app-directory/specification/examples/application/fdc3-workbench.json diff --git a/packages/fdc3-core/src/app-directory/specification/examples/application/myApplication.json b/packages/fdc3-standard/src/app-directory/specification/examples/application/myApplication.json similarity index 100% rename from packages/fdc3-core/src/app-directory/specification/examples/application/myApplication.json rename to packages/fdc3-standard/src/app-directory/specification/examples/application/myApplication.json diff --git a/packages/fdc3-core/src/app-directory/specification/test/index.js b/packages/fdc3-standard/src/app-directory/specification/test/index.js similarity index 100% rename from packages/fdc3-core/src/app-directory/specification/test/index.js rename to packages/fdc3-standard/src/app-directory/specification/test/index.js diff --git a/packages/fdc3-core/src/app-directory/specification/test/package-lock.json b/packages/fdc3-standard/src/app-directory/specification/test/package-lock.json similarity index 100% rename from packages/fdc3-core/src/app-directory/specification/test/package-lock.json rename to packages/fdc3-standard/src/app-directory/specification/test/package-lock.json diff --git a/packages/fdc3-core/src/app-directory/specification/test/package.json b/packages/fdc3-standard/src/app-directory/specification/test/package.json similarity index 100% rename from packages/fdc3-core/src/app-directory/specification/test/package.json rename to packages/fdc3-standard/src/app-directory/specification/test/package.json diff --git a/packages/fdc3-core/src/context/ContextType.ts b/packages/fdc3-standard/src/context/ContextType.ts similarity index 100% rename from packages/fdc3-core/src/context/ContextType.ts rename to packages/fdc3-standard/src/context/ContextType.ts diff --git a/packages/fdc3-core/src/index.ts b/packages/fdc3-standard/src/index.ts similarity index 100% rename from packages/fdc3-core/src/index.ts rename to packages/fdc3-standard/src/index.ts diff --git a/packages/fdc3-core/src/intents/Intents.ts b/packages/fdc3-standard/src/intents/Intents.ts similarity index 100% rename from packages/fdc3-core/src/intents/Intents.ts rename to packages/fdc3-standard/src/intents/Intents.ts diff --git a/packages/fdc3-core/src/intents/standard intents.json b/packages/fdc3-standard/src/intents/standard intents.json similarity index 100% rename from packages/fdc3-core/src/intents/standard intents.json rename to packages/fdc3-standard/src/intents/standard intents.json diff --git a/packages/fdc3-core/src/internal/contextConfiguration.ts b/packages/fdc3-standard/src/internal/contextConfiguration.ts similarity index 100% rename from packages/fdc3-core/src/internal/contextConfiguration.ts rename to packages/fdc3-standard/src/internal/contextConfiguration.ts diff --git a/packages/fdc3-core/src/internal/intentConfiguration.ts b/packages/fdc3-standard/src/internal/intentConfiguration.ts similarity index 100% rename from packages/fdc3-core/src/internal/intentConfiguration.ts rename to packages/fdc3-standard/src/internal/intentConfiguration.ts diff --git a/packages/fdc3-core/src/internal/typeHelpers.ts b/packages/fdc3-standard/src/internal/typeHelpers.ts similarity index 100% rename from packages/fdc3-core/src/internal/typeHelpers.ts rename to packages/fdc3-standard/src/internal/typeHelpers.ts diff --git a/packages/fdc3-core/src/protocols/bcp.ts b/packages/fdc3-standard/src/protocols/bcp.ts similarity index 99% rename from packages/fdc3-core/src/protocols/bcp.ts rename to packages/fdc3-standard/src/protocols/bcp.ts index a938a8663..3a617d77f 100644 --- a/packages/fdc3-core/src/protocols/bcp.ts +++ b/packages/fdc3-standard/src/protocols/bcp.ts @@ -1,5 +1,5 @@ /** - * Browser Communication Protocol (BCP) is used for communication between the "@kite9/fdc3-core" library and Browser-Resident DAs. + * Browser Communication Protocol (BCP) is used for communication between the "@kite9/fdc3-standard" library and Browser-Resident DAs. */ import { Context } from '@kite9/fdc3-schema' import { ContextType } from "../context/ContextType"; diff --git a/packages/fdc3-core/src/protocols/wcp.ts b/packages/fdc3-standard/src/protocols/wcp.ts similarity index 94% rename from packages/fdc3-core/src/protocols/wcp.ts rename to packages/fdc3-standard/src/protocols/wcp.ts index 3e0a6ff78..a40d7993c 100644 --- a/packages/fdc3-core/src/protocols/wcp.ts +++ b/packages/fdc3-standard/src/protocols/wcp.ts @@ -1,5 +1,5 @@ /** - * Web Connection Protocol (WCP) is used to establish connectivity between "@kite9/fdc3-core" and Browser-Resident DAs. + * Web Connection Protocol (WCP) is used to establish connectivity between "@kite9/fdc3-standard" and Browser-Resident DAs. */ import { AppMetadata } from "../api/AppMetadata"; diff --git a/packages/fdc3-core/src/ui/ChannelSelector.ts b/packages/fdc3-standard/src/ui/ChannelSelector.ts similarity index 100% rename from packages/fdc3-core/src/ui/ChannelSelector.ts rename to packages/fdc3-standard/src/ui/ChannelSelector.ts diff --git a/packages/fdc3-core/src/ui/Connectable.ts b/packages/fdc3-standard/src/ui/Connectable.ts similarity index 100% rename from packages/fdc3-core/src/ui/Connectable.ts rename to packages/fdc3-standard/src/ui/Connectable.ts diff --git a/packages/fdc3-core/src/ui/IntentResolver.ts b/packages/fdc3-standard/src/ui/IntentResolver.ts similarity index 100% rename from packages/fdc3-core/src/ui/IntentResolver.ts rename to packages/fdc3-standard/src/ui/IntentResolver.ts diff --git a/packages/fdc3-core/test/ContextTypes.test.ts b/packages/fdc3-standard/test/ContextTypes.test.ts similarity index 100% rename from packages/fdc3-core/test/ContextTypes.test.ts rename to packages/fdc3-standard/test/ContextTypes.test.ts diff --git a/packages/fdc3-core/test/Methods.test.ts b/packages/fdc3-standard/test/Methods.test.ts similarity index 100% rename from packages/fdc3-core/test/Methods.test.ts rename to packages/fdc3-standard/test/Methods.test.ts diff --git a/packages/fdc3-core/test/window.test.ts b/packages/fdc3-standard/test/window.test.ts similarity index 100% rename from packages/fdc3-core/test/window.test.ts rename to packages/fdc3-standard/test/window.test.ts diff --git a/packages/fdc3-core/tsconfig.json b/packages/fdc3-standard/tsconfig.json similarity index 100% rename from packages/fdc3-core/tsconfig.json rename to packages/fdc3-standard/tsconfig.json diff --git a/packages/testing/package.json b/packages/testing/package.json index 6d7f2897d..6fbff2679 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -15,7 +15,7 @@ "@cucumber/cucumber": "10.3.1", "@cucumber/html-formatter": "11.0.4", "@cucumber/pretty-formatter": "1.0.1", - "@kite9/fdc3-core": "2.2.0-beta.6", + "@kite9/fdc3-standard": "2.2.0-beta.6", "@types/expect": "24.3.0", "@types/lodash": "4.14.167", "@types/node": "^20.14.11", diff --git a/packages/testing/src/agent/index.ts b/packages/testing/src/agent/index.ts index db2f0b415..eeca2adfa 100644 --- a/packages/testing/src/agent/index.ts +++ b/packages/testing/src/agent/index.ts @@ -1,5 +1,5 @@ -import { AppIntent, Channel, Context, IntentResult } from "@kite9/fdc3-core"; -import { IntentResolver, IntentResolutionChoice, ChannelSelector } from "@kite9/fdc3-core"; +import { AppIntent, Channel, Context, IntentResult } from "@kite9/fdc3-standard"; +import { IntentResolver, IntentResolutionChoice, ChannelSelector } from "@kite9/fdc3-standard"; import { PropsWorld } from "../world"; /** diff --git a/packages/testing/tsconfig.json b/packages/testing/tsconfig.json index 7d59611c0..54616824d 100644 --- a/packages/testing/tsconfig.json +++ b/packages/testing/tsconfig.json @@ -15,7 +15,7 @@ ], "references": [ { - "path": "../fdc3-core" + "path": "../fdc3-standard" } ] } \ No newline at end of file diff --git a/toolbox/fdc3-for-web/da-server/package.json b/toolbox/fdc3-for-web/da-server/package.json index 04eed2870..de912b345 100644 --- a/toolbox/fdc3-for-web/da-server/package.json +++ b/toolbox/fdc3-for-web/da-server/package.json @@ -8,12 +8,12 @@ "types": "dist/src/index.d.ts", "scripts": { "clean": "rimraf dist; rimraf generated; rimraf node_modules; rimraf coverage; rimraf .nyc_output; rimraf cucumber-report.html", - "directory-openapi": "npx openapi-typescript ../../../packages/fdc3-core/src/app-directory/specification/appd.schema.json --output generated/directory-schema.ts", + "directory-openapi": "npx openapi-typescript ../../../packages/fdc3-standard/src/app-directory/specification/appd.schema.json --output generated/directory-schema.ts", "test": "npm run directory-openapi; tsc; nyc --reporter=lcov --reporter=text cucumber-js", "build": "npm run directory-openapi && tsc --module es2022" }, "dependencies": { - "@kite9/fdc3-core": "2.2.0-beta.6", + "@kite9/fdc3-standard": "2.2.0-beta.6", "@types/uuid": "^10.0.0", "uuid": "^9.0.1" }, diff --git a/toolbox/fdc3-for-web/da-server/src/BasicFDC3Server.ts b/toolbox/fdc3-for-web/da-server/src/BasicFDC3Server.ts index c67df7d0d..39c370def 100644 --- a/toolbox/fdc3-for-web/da-server/src/BasicFDC3Server.ts +++ b/toolbox/fdc3-for-web/da-server/src/BasicFDC3Server.ts @@ -4,7 +4,7 @@ import { BroadcastHandler, ChannelState } from "./handlers/BroadcastHandler"; import { IntentHandler } from "./handlers/IntentHandler"; import { Directory } from "./directory/DirectoryInterface"; import { OpenHandler } from "./handlers/OpenHandler"; -import { AppRequestMessage, WebConnectionProtocol4ValidateAppIdentity } from "@kite9/fdc3-core"; +import { AppRequestMessage, WebConnectionProtocol4ValidateAppIdentity } from "@kite9/fdc3-standard"; export interface MessageHandler { diff --git a/toolbox/fdc3-for-web/da-server/src/FDC3Server.ts b/toolbox/fdc3-for-web/da-server/src/FDC3Server.ts index 33f6c481e..7f83ab36a 100644 --- a/toolbox/fdc3-for-web/da-server/src/FDC3Server.ts +++ b/toolbox/fdc3-for-web/da-server/src/FDC3Server.ts @@ -1,4 +1,4 @@ -import { AppRequestMessage } from "@kite9/fdc3-core"; +import { AppRequestMessage } from "@kite9/fdc3-standard"; import { InstanceID } from "./ServerContext"; export interface FDC3Server { diff --git a/toolbox/fdc3-for-web/da-server/src/ServerContext.ts b/toolbox/fdc3-for-web/da-server/src/ServerContext.ts index 1165a8e6e..52b401644 100644 --- a/toolbox/fdc3-for-web/da-server/src/ServerContext.ts +++ b/toolbox/fdc3-for-web/da-server/src/ServerContext.ts @@ -1,5 +1,5 @@ -import { AppIntent, Context } from "@kite9/fdc3-core"; -import { AppIdentifier } from "@kite9/fdc3-core"; +import { AppIntent, Context } from "@kite9/fdc3-standard"; +import { AppIdentifier } from "@kite9/fdc3-standard"; /** diff --git a/toolbox/fdc3-for-web/da-server/src/handlers/BroadcastHandler.ts b/toolbox/fdc3-for-web/da-server/src/handlers/BroadcastHandler.ts index 0ed8cd677..c904d53bd 100644 --- a/toolbox/fdc3-for-web/da-server/src/handlers/BroadcastHandler.ts +++ b/toolbox/fdc3-for-web/da-server/src/handlers/BroadcastHandler.ts @@ -1,6 +1,6 @@ import { MessageHandler } from "../BasicFDC3Server"; import { InstanceID, ServerContext } from "../ServerContext"; -import { AppIdentifier, ChannelError, Context } from "@kite9/fdc3-core"; +import { AppIdentifier, ChannelError, Context } from "@kite9/fdc3-standard"; import { successResponse, errorResponse, onlyUnique } from "./support"; import { PrivateChannelEventListenerTypes, @@ -16,7 +16,7 @@ import { LeaveCurrentChannelRequest, JoinUserChannelRequest, GetCurrentChannelRequest, AgentEventMessage, CreatePrivateChannelRequest, DisplayMetadata -} from "@kite9/fdc3-core"; +} from "@kite9/fdc3-standard"; type ContextListenerRegistration = { appId: string, diff --git a/toolbox/fdc3-for-web/da-server/src/handlers/IntentHandler.ts b/toolbox/fdc3-for-web/da-server/src/handlers/IntentHandler.ts index 5a1b3e4b7..1a9d5eb13 100644 --- a/toolbox/fdc3-for-web/da-server/src/handlers/IntentHandler.ts +++ b/toolbox/fdc3-for-web/da-server/src/handlers/IntentHandler.ts @@ -10,7 +10,7 @@ import { IntentResultRequest, AppIdentifier, Context -} from "@kite9/fdc3-core"; +} from "@kite9/fdc3-standard"; import { errorResponse, errorResponseId, successResponse, successResponseId } from "./support"; diff --git a/toolbox/fdc3-for-web/da-server/src/handlers/OpenHandler.ts b/toolbox/fdc3-for-web/da-server/src/handlers/OpenHandler.ts index 501f22d44..ed194ad4a 100644 --- a/toolbox/fdc3-for-web/da-server/src/handlers/OpenHandler.ts +++ b/toolbox/fdc3-for-web/da-server/src/handlers/OpenHandler.ts @@ -12,7 +12,7 @@ import { WebConnectionProtocol4ValidateAppIdentity, WebConnectionProtocol5ValidateAppIdentityFailedResponse, WebConnectionProtocol5ValidateAppIdentitySuccessResponse -} from "@kite9/fdc3-core"; +} from "@kite9/fdc3-standard"; import { errorResponse, successResponse } from './support' enum AppState { Opening, DeliveringContext, Done } diff --git a/toolbox/fdc3-for-web/da-server/src/handlers/support.ts b/toolbox/fdc3-for-web/da-server/src/handlers/support.ts index b4f593217..d11820921 100644 --- a/toolbox/fdc3-for-web/da-server/src/handlers/support.ts +++ b/toolbox/fdc3-for-web/da-server/src/handlers/support.ts @@ -1,5 +1,5 @@ import { ServerContext } from "../ServerContext"; -import { AgentResponseMessage, AppIdentifier, AppRequestMessage } from "@kite9/fdc3-core"; +import { AgentResponseMessage, AppIdentifier, AppRequestMessage } from "@kite9/fdc3-standard"; export function successResponse(sc: ServerContext, request: AppRequestMessage, to: AppIdentifier, payload: any, type: string) { diff --git a/toolbox/fdc3-for-web/da-server/test/step-definitions/app-channel.steps.ts b/toolbox/fdc3-for-web/da-server/test/step-definitions/app-channel.steps.ts index 548948270..556bb775c 100644 --- a/toolbox/fdc3-for-web/da-server/test/step-definitions/app-channel.steps.ts +++ b/toolbox/fdc3-for-web/da-server/test/step-definitions/app-channel.steps.ts @@ -3,7 +3,7 @@ import { CustomWorld } from '../world'; import { createMeta } from './generic.steps'; import { GetOrCreateChannelRequest -} from '@kite9/fdc3-core' +} from '@kite9/fdc3-standard' import { handleResolve } from "@kite9/testing"; When('{string} creates or gets an app channel called {string}', function (this: CustomWorld, app: string, channel: string) { diff --git a/toolbox/fdc3-for-web/da-server/test/step-definitions/broadcast.steps.ts b/toolbox/fdc3-for-web/da-server/test/step-definitions/broadcast.steps.ts index 06639f7d1..5a94cdd8b 100644 --- a/toolbox/fdc3-for-web/da-server/test/step-definitions/broadcast.steps.ts +++ b/toolbox/fdc3-for-web/da-server/test/step-definitions/broadcast.steps.ts @@ -1,7 +1,7 @@ import { When } from '@cucumber/cucumber' import { CustomWorld } from '../world'; import { createMeta } from './generic.steps'; -import { AddContextListenerRequest, ContextListenerUnsubscribeRequest, BroadcastRequest, GetCurrentContextRequest } from '@kite9/fdc3-core'; +import { AddContextListenerRequest, ContextListenerUnsubscribeRequest, BroadcastRequest, GetCurrentContextRequest } from '@kite9/fdc3-standard'; import { handleResolve } from "@kite9/testing"; import { contextMap } from './generic.steps'; diff --git a/toolbox/fdc3-for-web/da-server/test/step-definitions/intents.steps.ts b/toolbox/fdc3-for-web/da-server/test/step-definitions/intents.steps.ts index edae88b7a..e5e844831 100644 --- a/toolbox/fdc3-for-web/da-server/test/step-definitions/intents.steps.ts +++ b/toolbox/fdc3-for-web/da-server/test/step-definitions/intents.steps.ts @@ -11,7 +11,7 @@ import { RaiseIntentRequest, RaiseIntentForContextRequest, IntentResultRequest -} from "@kite9/fdc3-core"; +} from "@kite9/fdc3-standard"; type ListensFor = { [key: string]: { diff --git a/toolbox/fdc3-for-web/da-server/test/step-definitions/private-channel.steps.ts b/toolbox/fdc3-for-web/da-server/test/step-definitions/private-channel.steps.ts index 96c153141..48b9122ce 100644 --- a/toolbox/fdc3-for-web/da-server/test/step-definitions/private-channel.steps.ts +++ b/toolbox/fdc3-for-web/da-server/test/step-definitions/private-channel.steps.ts @@ -6,7 +6,7 @@ import { PrivateChannelAddEventListenerRequest, PrivateChannelUnsubscribeEventListenerRequest, PrivateChannelDisconnectRequest -} from '@kite9/fdc3-core' +} from '@kite9/fdc3-standard' import { handleResolve } from "@kite9/testing"; When('{string} creates a private channel', function (this: CustomWorld, app: string) { diff --git a/toolbox/fdc3-for-web/da-server/test/step-definitions/start-app.steps.ts b/toolbox/fdc3-for-web/da-server/test/step-definitions/start-app.steps.ts index aa1b3e74c..69766f155 100644 --- a/toolbox/fdc3-for-web/da-server/test/step-definitions/start-app.steps.ts +++ b/toolbox/fdc3-for-web/da-server/test/step-definitions/start-app.steps.ts @@ -2,7 +2,7 @@ import { DataTable, Then, When } from '@cucumber/cucumber' import { CustomWorld } from '../world'; import { contextMap, createMeta } from './generic.steps'; import { matchData } from '@kite9/testing'; -import { OpenRequest, GetAppMetadataRequest, FindInstancesRequest, WebConnectionProtocol4ValidateAppIdentity } from '@kite9/fdc3-core'; +import { OpenRequest, GetAppMetadataRequest, FindInstancesRequest, WebConnectionProtocol4ValidateAppIdentity } from '@kite9/fdc3-standard'; When('{string} is opened with connection id {string}', function (this: CustomWorld, app: string, uuid: string) { const meta = createMeta(this, app) diff --git a/toolbox/fdc3-for-web/da-server/test/step-definitions/user-channel.steps.ts b/toolbox/fdc3-for-web/da-server/test/step-definitions/user-channel.steps.ts index 1c2b91025..de7d2c79a 100644 --- a/toolbox/fdc3-for-web/da-server/test/step-definitions/user-channel.steps.ts +++ b/toolbox/fdc3-for-web/da-server/test/step-definitions/user-channel.steps.ts @@ -7,7 +7,7 @@ import { JoinUserChannelRequest, LeaveCurrentChannelRequest, GetCurrentContextRequest -} from '@kite9/fdc3-core' +} from '@kite9/fdc3-standard' import { handleResolve } from "@kite9/testing"; diff --git a/toolbox/fdc3-for-web/da-server/tsconfig.json b/toolbox/fdc3-for-web/da-server/tsconfig.json index 5ef9cad96..9d572e985 100644 --- a/toolbox/fdc3-for-web/da-server/tsconfig.json +++ b/toolbox/fdc3-for-web/da-server/tsconfig.json @@ -18,7 +18,7 @@ ], "references": [ { - "path": "../../../packages/fdc3-core" + "path": "../../../packages/fdc3-standard" }, { "path": "../../../packages/testing" diff --git a/toolbox/fdc3-for-web/demo/package.json b/toolbox/fdc3-for-web/demo/package.json index fa662d4e7..0ae26fb6e 100644 --- a/toolbox/fdc3-for-web/demo/package.json +++ b/toolbox/fdc3-for-web/demo/package.json @@ -15,7 +15,7 @@ "dependencies": { "@kite9/fdc3-get-agent": "2.2.0-beta.6", "@kite9/da-server": "2.2.0-beta.6", - "@kite9/fdc3-core": "2.2.0-beta.6", + "@kite9/fdc3-standard": "2.2.0-beta.6", "@types/uuid": "^10.0.0", "@types/ws": "^8.5.10", "express": "^4.18.3", diff --git a/toolbox/fdc3-for-web/demo/src/client/da/dummy-desktop-agent.ts b/toolbox/fdc3-for-web/demo/src/client/da/dummy-desktop-agent.ts index a9e43b1c8..579623de1 100644 --- a/toolbox/fdc3-for-web/demo/src/client/da/dummy-desktop-agent.ts +++ b/toolbox/fdc3-for-web/demo/src/client/da/dummy-desktop-agent.ts @@ -4,7 +4,7 @@ import { APP_GOODBYE, APP_HELLO, DA_HELLO, FDC3_APP_EVENT } from "../../message- import { DemoServerContext } from "./DemoServerContext"; import { FDC3_2_1_JSONDirectory } from "./FDC3_2_1_JSONDirectory"; import { DefaultFDC3Server, DirectoryApp, ServerContext } from "@kite9/da-server"; -import { WebConnectionProtocol2LoadURL } from "@kite9/fdc3-core"; +import { WebConnectionProtocol2LoadURL } from "@kite9/fdc3-standard"; import { ChannelState, ChannelType } from "@kite9/da-server/src/handlers/BroadcastHandler"; import { link } from "./util"; diff --git a/toolbox/fdc3-for-web/demo/src/client/ui/channel-selector.ts b/toolbox/fdc3-for-web/demo/src/client/ui/channel-selector.ts index 1156ee0ef..0448dbbe7 100644 --- a/toolbox/fdc3-for-web/demo/src/client/ui/channel-selector.ts +++ b/toolbox/fdc3-for-web/demo/src/client/ui/channel-selector.ts @@ -1,4 +1,4 @@ -import { IframeChannels } from "@kite9/fdc3-core"; +import { IframeChannels } from "@kite9/fdc3-standard"; var channels: any[] = [] var channelId: string | null = null diff --git a/toolbox/fdc3-for-web/demo/src/client/ui/intent-resolver.ts b/toolbox/fdc3-for-web/demo/src/client/ui/intent-resolver.ts index 5310506a8..d0390a528 100644 --- a/toolbox/fdc3-for-web/demo/src/client/ui/intent-resolver.ts +++ b/toolbox/fdc3-for-web/demo/src/client/ui/intent-resolver.ts @@ -1,4 +1,4 @@ -import { AppIdentifier, IframeResolveAction, IframeResolvePayload } from "@kite9/fdc3-core"; +import { AppIdentifier, IframeResolveAction, IframeResolvePayload } from "@kite9/fdc3-standard"; const DEFAULT_COLLAPSED_CSS = { position: "fixed", diff --git a/toolbox/fdc3-for-web/demo/tsconfig.json b/toolbox/fdc3-for-web/demo/tsconfig.json index 4640e702e..21eef46ab 100644 --- a/toolbox/fdc3-for-web/demo/tsconfig.json +++ b/toolbox/fdc3-for-web/demo/tsconfig.json @@ -23,10 +23,10 @@ ], "references": [ { - "path": "../../../packages/fdc3-core" + "path": "../../../packages/fdc3-standard" }, { - "path": "../../../packages/client" + "path": "../../../packages/fdc3-get-agent" }, { "path": "../da-server" diff --git a/toolbox/fdc3-workbench/src/utility/Fdc3Api.ts b/toolbox/fdc3-workbench/src/utility/Fdc3Api.ts index a1ed2cc98..b8ebd15fb 100644 --- a/toolbox/fdc3-workbench/src/utility/Fdc3Api.ts +++ b/toolbox/fdc3-workbench/src/utility/Fdc3Api.ts @@ -2,7 +2,7 @@ * SPDX-License-Identifier: Apache-2.0 * Copyright FINOS FDC3 contributors - see NOTICE file */ -import * as fdc3_2 from "@kite9/fdc3-core"; +import * as fdc3_2 from "@kite9/fdc3-standard"; import * as fdc3_1 from "fdc3-1.2"; import { group } from "console"; import { fdc3Ready } from '@kite9/fdc3-get-agent'