[AXON-1487] remove direct dependency on guipi-core-controller

eslint.config.mjs

@@ -7,11 +7,19 @@ const compat = new FlatCompat({
     recommendedConfig: {},
     allConfig: {},
     overrideConfig: {},
-    warnIncompatible: true
+    warnIncompatible: true,
 });
 
 export default tseslint.config(
-    ...compat.plugins('@typescript-eslint', 'react', 'react-dom', 'react-hooks', 'import', 'prettier', 'simple-import-sort'),
+    ...compat.plugins(
+        '@typescript-eslint',
+        'react',
+        'react-dom',
+        'react-hooks',
+        'import',
+        'prettier',
+        'simple-import-sort',
+    ),
     {
         languageOptions: {
             ecmaVersion: 2020,
@@ -28,10 +36,7 @@ export default tseslint.config(
                 es6: true,
             },
         },
-        ignores: [
-            "/src/analytics-node-client/src/client.min.js",
-            "/eslint.config.msj",
-        ],
+        ignores: ['/src/analytics-node-client/src/client.min.js', '/eslint.config.msj'],
         rules: {
             'prettier/prettier': 'error',
             'react/jsx-filename-extension': [2, { extensions: ['.js', '.jsx', '.ts', '.tsx'] }],
@@ -45,16 +50,12 @@ export default tseslint.config(
                     format: ['PascalCase'],
                 },
             ],
-            'import/no-extraneous-dependencies': [
-                'error',
-                { devDependencies: true },
-            ],
+            'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
             'no-restricted-imports': [
                 'error',
                 {
                     patterns: [
                         '@atlassianlabs/guipi-core-components/*',
-                        '@atlassianlabs/guipi-core-controller/*',
                         '@atlassianlabs/guipi-jira-components/*',
                         '@atlassianlabs/jira-metaui-client/*',
                         '@atlassianlabs/jira-metaui-transformer/*',
@@ -64,22 +65,28 @@ export default tseslint.config(
                     ],
                 },
             ],
-            "no-unused-vars": ["error", {
-                "vars": "all",
-                "args": "none",
-                "caughtErrors": "all",
-                "ignoreRestSiblings": false,
-            }],
+            'no-unused-vars': [
+                'error',
+                {
+                    vars: 'all',
+                    args: 'none',
+                    caughtErrors: 'all',
+                    ignoreRestSiblings: false,
+                },
+            ],
             'brace-style': 'off',
             'no-throw-literal': 'error',
             'no-var': 'error',
             'prefer-const': 'error',
             'no-cond-assign': 'error',
             'no-multi-assign': 'error',
-            'no-unused-expressions': ['error', {
-                "allowShortCircuit": true,
-                "allowTernary": true,
-            }],
+            'no-unused-expressions': [
+                'error',
+                {
+                    allowShortCircuit: true,
+                    allowTernary: true,
+                },
+            ],
             curly: 'error',
             eqeqeq: ['error', 'always'],
             semi: 'off',
@@ -101,5 +108,5 @@ export default tseslint.config(
     {
         name: 'atlascode-ts-config',
         files: ['**/*.ts', '**/*.tsx'],
-    }
+    },
 );

package.json

@@ -1551,7 +1551,6 @@
         "@atlaskit/tooltip": "^20.4.3",
         "@atlaskit/width-detector": "^5.0.4",
         "@atlassianlabs/guipi-core-components": "^3.2.0",
-        "@atlassianlabs/guipi-core-controller": "^3.2.0",
         "@atlassianlabs/guipi-jira-components": "^3.2.0",
         "@atlassianlabs/jira-metaui-client": "^2.0.0",
         "@atlassianlabs/jira-metaui-transformer": "^2.0.0",

src/ipc/messaging.ts

@@ -48,3 +48,13 @@ export interface LegacyPMFData {
     q3: string;
     q4: string;
 }
+
+export type ReducerAction<K, V = void> = V extends void ? { type: K } : { type: K } & V;
+
+export function defaultStateGuard<S>(state: S, a: never) {
+    return state;
+}
+
+export function defaultActionGuard(a: never) {
+    return;
+}

src/lib/ipc/fromUI/common.ts

@@ -1,5 +1,5 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { MinimalIssueOrKeyAndSite } from '@atlassianlabs/jira-pi-common-models';
+import { ReducerAction } from 'src/ipc/messaging';
 
 import { UIErrorInfo } from '../../../analyticsTypes';
 import { DetailedSiteInfo } from '../../../atlclients/authInfo';

src/lib/ipc/fromUI/config.ts

@@ -1,4 +1,4 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
+import { ReducerAction } from 'src/ipc/messaging';
 
 import { AuthInfo, DetailedSiteInfo, SiteInfo } from '../../../atlclients/authInfo';
 import { ConfigTarget } from '../models/config';

src/lib/ipc/fromUI/createPullRequest.ts

@@ -1,5 +1,5 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { MinimalIssue, Transition } from '@atlassianlabs/jira-pi-common-models';
+import { ReducerAction } from 'src/ipc/messaging';
 
 import { DetailedSiteInfo } from '../../../atlclients/authInfo';
 import { BitbucketSite, FileDiff, SiteRemote, User, WorkspaceRepo } from '../../../bitbucket/model';

src/lib/ipc/fromUI/pipelineSummary.ts

@@ -1,4 +1,4 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
+import { ReducerAction } from 'src/ipc/messaging';
 
 import { PipelineLogReference } from '../../../pipelines/model';
 import { CommonAction } from './common';

src/lib/ipc/fromUI/pullRequestDetails.ts

@@ -1,5 +1,5 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { MinimalIssue } from '@atlassianlabs/jira-pi-common-models';
+import { ReducerAction } from 'src/ipc/messaging';
 
 import { DetailedSiteInfo } from '../../../atlclients/authInfo';
 import {

src/lib/ipc/fromUI/startWork.ts

@@ -1,5 +1,5 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { Transition } from '@atlassianlabs/jira-pi-common-models';
+import { ReducerAction } from 'src/ipc/messaging';
 
 import { WorkspaceRepo } from '../../../bitbucket/model';
 import { Branch } from '../../../typings/git';

src/lib/ipc/toUI/common.ts

@@ -1,4 +1,4 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
+import { ReducerAction } from 'src/ipc/messaging';
 
 export enum CommonMessageType {
     Error = 'error',

src/lib/ipc/toUI/config.ts

@@ -1,11 +1,11 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import {
     AutocompleteSuggestion,
     FilterSearchResults,
     JQLAutocompleteData,
     JQLErrors,
 } from '@atlassianlabs/jira-pi-common-models';
 import { flatten } from 'flatten-anything';
+import { ReducerAction } from 'src/ipc/messaging';
 
 import { AuthInfo, DetailedSiteInfo, emptyBasicAuthInfo, emptySiteInfo } from '../../../atlclients/authInfo';
 import { emptyConfig } from '../../../config/model';

src/lib/ipc/toUI/createPullRequest.ts

@@ -1,5 +1,5 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { MinimalIssue } from '@atlassianlabs/jira-pi-common-models';
+import { ReducerAction } from 'src/ipc/messaging';
 
 import { DetailedSiteInfo } from '../../../atlclients/authInfo';
 import { BitbucketBranchingModel, Commit, FileDiff, PullRequest, User, WorkspaceRepo } from '../../../bitbucket/model';

src/lib/ipc/toUI/pipelineSummary.ts

@@ -1,4 +1,4 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
+import { ReducerAction } from 'src/ipc/messaging';
 
 import { Pipeline, PipelineStep } from '../../../pipelines/model';
 

src/lib/ipc/toUI/pullRequestDetails.ts

@@ -1,5 +1,5 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { MinimalIssue } from '@atlassianlabs/jira-pi-common-models';
+import { ReducerAction } from 'src/ipc/messaging';
 
 import { DetailedSiteInfo } from '../../../atlclients/authInfo';
 import {

src/lib/ipc/toUI/startWork.ts

@@ -1,5 +1,5 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { createEmptyMinimalIssue, MinimalIssue } from '@atlassianlabs/jira-pi-common-models';
+import { ReducerAction } from 'src/ipc/messaging';
 
 import { DetailedSiteInfo, emptySiteInfo } from '../../../atlclients/authInfo';
 import { BitbucketBranchingModel, WorkspaceRepo } from '../../../bitbucket/model';

src/lib/webview/controller/config/configV3WebviewController.test.ts

@@ -19,7 +19,7 @@ import { ConfigActionApi } from './configActionApi';
 import { ConfigV3WebviewController, id } from './configV3WebviewController';
 
 jest.mock('uuid');
-jest.mock('@atlassianlabs/guipi-core-controller', () => ({
+jest.mock('src/ipc/messaging', () => ({
     defaultActionGuard: jest.fn(),
 }));
 jest.mock('vscode', () => {
@@ -697,7 +697,7 @@ describe('ConfigV3WebviewController', () => {
         });
 
         test('should call defaultActionGuard for unknown action types', async () => {
-            const { defaultActionGuard } = require('@atlassianlabs/guipi-core-controller');
+            const { defaultActionGuard } = require('src/ipc/messaging');
             const unknownAction = { type: 'unknown' };
 
             await controller.onMessageReceived(unknownAction as any);

src/lib/webview/controller/config/configV3WebviewController.ts

@@ -1,5 +1,5 @@
-import { defaultActionGuard } from '@atlassianlabs/guipi-core-controller';
 import Axios from 'axios';
+import { defaultActionGuard } from 'src/ipc/messaging';
 import { ConfigV3Section } from 'src/lib/ipc/models/config';
 import { Logger } from 'src/logger';
 import { Features } from 'src/util/features';

src/lib/webview/controller/config/configWebviewController.test.ts

@@ -19,7 +19,7 @@ import { ConfigActionApi } from './configActionApi';
 import { ConfigWebviewController, id } from './configWebviewController';
 
 jest.mock('uuid');
-jest.mock('@atlassianlabs/guipi-core-controller', () => ({
+jest.mock('src/ipc/messaging', () => ({
     defaultActionGuard: jest.fn(),
 }));
 jest.mock('vscode', () => {
@@ -544,7 +544,7 @@ describe('ConfigWebviewController', () => {
         });
 
         test('should call defaultActionGuard for unknown action types', async () => {
-            const { defaultActionGuard } = require('@atlassianlabs/guipi-core-controller');
+            const { defaultActionGuard } = require('src/ipc/messaging');
             const unknownAction = { type: 'unknown' };
 
             await controller.onMessageReceived(unknownAction as any);

src/lib/webview/controller/config/configWebviewController.ts

@@ -1,5 +1,5 @@
-import { defaultActionGuard } from '@atlassianlabs/guipi-core-controller';
 import Axios from 'axios';
+import { defaultActionGuard } from 'src/ipc/messaging';
 import { Logger } from 'src/logger';
 import { Features } from 'src/util/features';
 import { v4 } from 'uuid';

src/lib/webview/controller/pullrequest/createPullRequestWebviewController.ts

@@ -1,5 +1,5 @@
-import { defaultActionGuard } from '@atlassianlabs/guipi-core-controller';
 import Axios from 'axios';
+import { defaultActionGuard } from 'src/ipc/messaging';
 import { Logger } from 'src/logger';
 
 import { Registry } from '../../../../analytics';

src/lib/webview/controller/pullrequest/pullRequestDetailsWebviewController.ts

@@ -1,6 +1,6 @@
-import { defaultActionGuard } from '@atlassianlabs/guipi-core-controller';
 import { MinimalIssue } from '@atlassianlabs/jira-pi-common-models';
 import Axios from 'axios';
+import { defaultActionGuard } from 'src/ipc/messaging';
 import { Logger } from 'src/logger';
 import { Uri } from 'vscode';
 

src/lib/webview/controller/startwork/startWorkWebviewController.test.ts

@@ -1,5 +1,5 @@
-import { defaultActionGuard } from '@atlassianlabs/guipi-core-controller';
 import { createEmptyMinimalIssue, MinimalIssue, Transition } from '@atlassianlabs/jira-pi-common-models';
+import { defaultActionGuard } from 'src/ipc/messaging';
 import { Logger } from 'src/logger';
 
 import { DetailedSiteInfo, emptySiteInfo, ProductBitbucket } from '../../../../atlclients/authInfo';
@@ -24,7 +24,7 @@ import { StartWorkActionApi } from './startWorkActionApi';
 import { StartWorkWebviewController } from './startWorkWebviewController';
 
 // Mock dependencies
-jest.mock('@atlassianlabs/guipi-core-controller');
+jest.mock('src/ipc/messaging');
 jest.mock('../../../../container');
 jest.mock('../../formatError');
 jest.mock('../../../../util/featureFlags', () => ({

src/lib/webview/controller/startwork/startWorkWebviewController.ts

@@ -1,4 +1,4 @@
-import { defaultActionGuard } from '@atlassianlabs/guipi-core-controller';
+import { defaultActionGuard } from 'src/ipc/messaging';
 import { ConfigSection, ConfigSubSection, ConfigV3Section, ConfigV3SubSection } from 'src/lib/ipc/models/config';
 import { Logger } from 'src/logger';
 import * as vscode from 'vscode';

src/react/atlascode/common/errorController.ts

@@ -1,5 +1,5 @@
-import { defaultStateGuard, ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { createContext, useCallback, useMemo, useReducer } from 'react';
+import { defaultStateGuard, ReducerAction } from 'src/ipc/messaging';
 
 interface ErrorControllerApi {
     showError: (details: any) => void;

src/react/atlascode/common/pmf/pmfController.ts

@@ -1,5 +1,5 @@
-import { defaultStateGuard, ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { createContext, useCallback, useMemo, useReducer } from 'react';
+import { defaultStateGuard, ReducerAction } from 'src/ipc/messaging';
 
 import { CommonAction, CommonActionType } from '../../../../lib/ipc/fromUI/common';
 import { PMFData } from '../../../../lib/ipc/models/common';

src/react/atlascode/config/configController.ts

@@ -1,8 +1,8 @@
-import { defaultActionGuard, defaultStateGuard, ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { JqlAutocompleteRestData, Suggestion } from '@atlassianlabs/guipi-jira-components';
 import { FilterSearchResults, JQLErrors } from '@atlassianlabs/jira-pi-common-models';
 import React, { useCallback, useMemo, useReducer } from 'react';
 import { UIErrorInfo } from 'src/analyticsTypes';
+import { defaultActionGuard, defaultStateGuard, ReducerAction } from 'src/ipc/messaging';
 import { v4 } from 'uuid';
 
 import { AuthInfo, DetailedSiteInfo, SiteInfo } from '../../../atlclients/authInfo';

src/react/atlascode/messagingApi.ts

@@ -1,6 +1,6 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { useCallback, useContext, useEffect, useMemo } from 'react';
 
+import { ReducerAction } from '../../ipc/messaging';
 import { CommonMessageType } from '../../lib/ipc/toUI/common';
 import { ErrorControllerContext } from './common/errorController';
 import { PMFControllerContext } from './common/pmf/pmfController';

src/react/atlascode/pipelines/pipelineSummaryController.ts

@@ -1,5 +1,5 @@
-import { defaultStateGuard, ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import React, { useCallback, useMemo, useReducer } from 'react';
+import { defaultStateGuard, ReducerAction } from 'src/ipc/messaging';
 
 import { CommonActionType } from '../../../lib/ipc/fromUI/common';
 import { PipelineSummaryAction, PipelineSummaryActionType } from '../../../lib/ipc/fromUI/pipelineSummary';

src/react/atlascode/pullrequest/createPullRequestController.ts

@@ -1,6 +1,6 @@
-import { defaultActionGuard, defaultStateGuard, ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { MinimalIssue } from '@atlassianlabs/jira-pi-common-models';
 import React, { useCallback, useMemo, useReducer } from 'react';
+import { defaultActionGuard, defaultStateGuard, ReducerAction } from 'src/ipc/messaging';
 import { v4 } from 'uuid';
 
 import { DetailedSiteInfo } from '../../../atlclients/authInfo';

src/react/atlascode/pullrequest/pullRequestDetailsController.ts

@@ -1,6 +1,6 @@
-import { defaultActionGuard, defaultStateGuard, ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { MinimalIssue } from '@atlassianlabs/jira-pi-common-models';
 import React, { useCallback, useMemo, useReducer } from 'react';
+import { defaultActionGuard, defaultStateGuard, ReducerAction } from 'src/ipc/messaging';
 import { v4 } from 'uuid';
 
 import { DetailedSiteInfo } from '../../../atlclients/authInfo';

src/react/atlascode/startwork/startWorkController.ts

@@ -1,6 +1,6 @@
-import { defaultStateGuard, ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { Transition } from '@atlassianlabs/jira-pi-common-models';
 import React, { useCallback, useMemo, useReducer } from 'react';
+import { defaultStateGuard, ReducerAction } from 'src/ipc/messaging';
 
 import { WorkspaceRepo } from '../../../bitbucket/model';
 import { CommonActionType } from '../../../lib/ipc/fromUI/common';

src/rovo-dev/rovoDevWebviewProviderMessages.ts

@@ -1,7 +1,7 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { MinimalIssue } from '@atlassianlabs/jira-pi-common-models';
 
 import { DetailedSiteInfo } from '../atlclients/authInfo';
+import { ReducerAction } from '../ipc/messaging';
 import {
     EntitlementCheckRovoDevHealthcheckResponse,
     RovoDevRetryPromptResponse,

src/rovo-dev/ui/rovoDevViewMessages.tsx

@@ -1,6 +1,6 @@
-import { ReducerAction } from '@atlassianlabs/guipi-core-controller';
 import { RovoDevContextItem, RovoDevPrompt, ToolPermissionDialogChoice } from 'src/rovo-dev/rovoDevTypes';
 
+import { ReducerAction } from '../../ipc/messaging';
 import { FeedbackType } from './feedback-form/FeedbackForm';
 
 export const enum RovoDevViewResponseType {

src/webview/common/vscCommonMessageActionHandler.ts

@@ -1,4 +1,4 @@
-import { defaultActionGuard } from '@atlassianlabs/guipi-core-controller';
+import { defaultActionGuard } from 'src/ipc/messaging';
 import { env, Uri } from 'vscode';
 
 import { IntegrationsLinkParams } from '../../atlclients/authInfo';