Add WSO2 integrator

.vscode/launch.json

@@ -235,6 +235,33 @@
             ],
             "preLaunchTask": "watch-mi-tests"
         },
+        {
+            "name": "WSO2 Integrator Extension",
+            "type": "extensionHost",
+            "request": "launch",
+            "env": {
+                "WEB_VIEW_DEV_MODE": "true",
+                "WEB_VIEW_DEV_HOST": "http://localhost:3000",
+            },
+            "trace":true,
+            "debugWebviews": true,
+            "args": [
+                "--extensionDevelopmentPath=${workspaceFolder}/workspaces/wi/wi-extension"
+            ],
+            "outFiles": [
+                "${workspaceFolder}/workspaces/wi/wi-extension/dist/**/*.js",
+                "${workspaceFolder}/workspaces/wi/wi-webviews/lib/**/*"
+            ],
+            "skipFiles": [
+                "**/node_modules/**"
+            ],
+            "rendererDebugOptions": {
+                "sourceMaps": true,
+                "webRoot": "${workspaceFolder}/workspaces/wi/wi-webviews",
+            },
+            "preLaunchTask": "npm: watch-wi",
+            "envFile": "${workspaceFolder}/workspaces/wi/wi-extension/.env"
+        },
         {
             "name": "Ballerina Extension AI Tests",
             "type": "extensionHost",
@@ -245,7 +272,8 @@
                 "--extensionTestsPath=${workspaceFolder}/workspaces/ballerina/ballerina-extension/out/test",
                 "${workspaceFolder}/workspaces/ballerina/ballerina-extension/test/data/bi_empty_project",
                 "${workspaceFolder}/workspaces/ballerina/ballerina-extension/test/data/bi_init",
-                "${workspaceFolder}/workspaces/ballerina/ballerina-extension/test/data/simple_order_management_system","${workspaceFolder}/workspaces/ballerina/ballerina-extension/test/data/ai_datamapper"
+                "${workspaceFolder}/workspaces/ballerina/ballerina-extension/test/data/simple_order_management_system",
+                "${workspaceFolder}/workspaces/ballerina/ballerina-extension/test/data/ai_datamapper"
             ],
             "env": {
                 "LS_EXTENSIONS_PATH": "",
@@ -294,4 +322,4 @@
             "preLaunchTask": "npm: watch-apk"
         },
     ]
-}
+}

.vscode/tasks.json

@@ -218,6 +218,22 @@
 			"type": "npm",
 			"script": "watch",
             "path": "workspaces/mi/mi-extension",
+            "problemMatcher": "$tsc-watch",
+			"isBackground": true,
+			"presentation": {
+				"reveal": "never",
+				"group": "watchers"
+			},
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			}
+		},
+        {
+            "label": "npm: watch-wi",
+			"type": "npm",
+			"script": "watch",
+            "path": "workspaces/wi/wi-extension",
             "problemMatcher": "$tsc-watch",
 			"isBackground": true,
 			"presentation": {

workspaces/api-designer/api-designer-extension/package.json

@@ -83,7 +83,7 @@
     "clean": "rimraf ./dist",
     "compile": "tsc -p .",
     "watch": "tsc -p . -w",
-    "package": "if [ $isPreRelease = true ]; then vsce package --no-dependencies --pre-release; else vsce package --no-dependencies; fi",
+    "package": "node ../../common-libs/scripts/package-vsix.js",
     "build": "pnpm clean && pnpm run copyFonts && webpack --mode production --devtool hidden-source-map && pnpm run package && pnpm run postbuild",
     "compile-tests": "pnpm run compile",
     "watch-tests": "pnpm run watch",

workspaces/apk/apk-extension/package.json

@@ -51,7 +51,7 @@
       "pretest": "npm run compile && npm run lint",
       "lint": "eslint src --ext ts",
       "test": "node ./out/test/runTest.js",
-      "build": "if [ $isPreRelease = true ]; then vsce package --no-dependencies --pre-release; else vsce package --no-dependencies; fi && pnpm run postbuild",
+      "build": "node ../../common-libs/scripts/package-vsix.js && pnpm run postbuild",
       "postbuild": "pnpm run copyVSIX",
       "copyVSIX": "copyfiles *.vsix ./vsix",
       "copyVSIXToRoot": "copyfiles -f ./vsix/* ../../.."

workspaces/ballerina/ballerina-core/src/interfaces/constants.ts

@@ -32,7 +32,6 @@ export const BI_COMMANDS = {
     BI_RUN_PROJECT: 'BI.project.run',
     BI_DEBUG_PROJECT: 'BI.project.debug',
     REFRESH_COMMAND: 'BI.project-explorer.refresh',
-    FOCUS_PROJECT_EXPLORER: 'BI.project-explorer.focus',
     PROJECT_EXPLORER: 'BI.project-explorer',
     ADD_CONNECTIONS: 'BI.project-explorer.add-connection',
     ADD_CUSTOM_CONNECTOR: 'BI.project-explorer.add-custom-connector',
@@ -52,5 +51,7 @@ export const BI_COMMANDS = {
     BI_EDIT_TEST_FUNCTION_DEF: 'BI.test.edit.function.def',
     ADD_NATURAL_FUNCTION: 'BI.project-explorer.add-natural-function',
     TOGGLE_TRACE_LOGS: 'BI.toggle.trace.logs',
-    ADD_INTEGRATION: 'BI.project-explorer.add-integration',
+    CREATE_BI_PROJECT: 'BI.project.createBIProjectPure',
+    CREATE_BI_MIGRATION_PROJECT: 'BI.project.createBIProjectMigration',
+    ADD_INTEGRATION: 'BI.project-explorer.add-integration'
 };

workspaces/ballerina/ballerina-extension/package.json

@@ -1181,7 +1181,7 @@
         "test-coverage": "cross-env COVER_CONFIG=html pnpm run test",
         "build-tm-grammar": "js-yaml grammar/ballerina-grammar/syntaxes/ballerina.tmLanguage.yaml > grammar/ballerina-grammar/syntaxes/ballerina.tmLanguage.json",
         "lint": "tslint --fix 'src/**/*{.ts,.tsx}'",
-        "package": "if [ $isPreRelease = true ]; then vsce package --no-dependencies --pre-release; else vsce package --no-dependencies; fi",
+        "package": "node ../../common-libs/scripts/package-vsix.js",
         "copyFonts": "copyfiles -f ./node_modules/@wso2/font-wso2-vscode/dist/* ./resources/font-wso2-vscode/dist/",
         "copyVSIX": "copyfiles *.vsix ./vsix",
         "copyVSIXToRoot": "copyfiles -f ./vsix/*.vsix ../../..",

workspaces/ballerina/ballerina-extension/src/features/bi/activator.ts

@@ -35,6 +35,7 @@ import { readFileSync, readdirSync, statSync } from "fs";
 import path from "path";
 import { isPositionEqual, isPositionWithinDeletedComponent } from "../../utils/history/util";
 import { startDebugging } from "../editor-support/activator";
+import { createBIProjectFromMigration, createBIProjectPure } from "../../utils/bi";
 import { createVersionNumber, isSupportedSLVersion } from ".././../utils";
 import { extension } from "../../BalExtensionContext";
 
@@ -60,7 +61,7 @@ function handleCommandWithContext(
     // Scenario 1: Multi-package workspace invoked from command palette
     if (isBalWorkspace && !item) {
         const packageList = StateMachine.context().projectInfo?.children.map((child) => child.projectPath);
-        
+
         if (!packageList || packageList.length === 0) {
             openView(EVENT_TYPE.OPEN_VIEW, { view, ...additionalViewParams });
             return;
@@ -70,23 +71,23 @@ function handleCommandWithContext(
             placeHolder: "Select a package"
         }).then((selectedPackage) => {
             if (selectedPackage) {
-                openView(EVENT_TYPE.OPEN_VIEW, { 
-                    view, 
-                    projectPath: selectedPackage, 
-                    ...additionalViewParams 
+                openView(EVENT_TYPE.OPEN_VIEW, {
+                    view,
+                    projectPath: selectedPackage,
+                    ...additionalViewParams
                 });
             }
         });
     }
     // Scenario 2: Invoked from tree view with item context
     else if (item?.resourceUri) {
         const projectPath = item.resourceUri.fsPath;
-        openView(EVENT_TYPE.OPEN_VIEW, { 
-            view, 
-            projectPath, 
-            ...additionalViewParams 
+        openView(EVENT_TYPE.OPEN_VIEW, {
+            view,
+            projectPath,
+            ...additionalViewParams
         });
-    } 
+    }
     // Scenario 3: Default - no specific context
     else {
         openView(EVENT_TYPE.OPEN_VIEW, { view, ...additionalViewParams });
@@ -95,7 +96,7 @@ function handleCommandWithContext(
 
 export function activate(context: BallerinaExtension) {
     const isWorkspaceSupported = isSupportedSLVersion(extension.ballerinaExtInstance, createVersionNumber(2201, 13, 0));
-    
+
     // Set context for command visibility
     commands.executeCommand('setContext', 'ballerina.bi.workspaceSupported', isWorkspaceSupported);
 
@@ -154,7 +155,7 @@ export function activate(context: BallerinaExtension) {
             window.showErrorMessage('This command requires Ballerina version 2201.13.0 or higher. ');
             return;
         }
-        
+
         const projectPath = StateMachine.context().projectPath || StateMachine.context().workspacePath;
         if (projectPath) {
             openView(EVENT_TYPE.OPEN_VIEW, { view: MACHINE_VIEW.BIAddProjectForm });
@@ -173,6 +174,14 @@ export function activate(context: BallerinaExtension) {
 
     commands.registerCommand(BI_COMMANDS.TOGGLE_TRACE_LOGS, toggleTraceLogs);
 
+    commands.registerCommand(BI_COMMANDS.CREATE_BI_PROJECT, (params) => {
+        return createBIProjectPure(params);
+    });
+
+    commands.registerCommand(BI_COMMANDS.CREATE_BI_MIGRATION_PROJECT, (params) => {
+        return createBIProjectFromMigration(params);
+    });
+
     commands.registerCommand(BI_COMMANDS.DELETE_COMPONENT, async (item?: TreeItem & { info?: string }) => {
         // Guard: DELETE requires a tree item context
         if (!item) {

workspaces/bi/bi-extension/package.json

@@ -67,7 +67,8 @@
             "ballerina-integrator": [
                 {
                     "id": "BI.project-explorer",
-                    "name": ""
+                    "name": "",
+                    "when": "!config.integrator.defaultIntegrator"
                 }
             ]
         },
@@ -162,7 +163,7 @@
         "lint": "eslint src --ext ts",
         "test": "node ./out/test/runTest.js",
         "build": "pnpm run compile && pnpm run lint && pnpm run postbuild",
-        "package": "if [ $isPreRelease = true ]; then vsce package --no-dependencies --pre-release; else vsce package --no-dependencies; fi",
+        "package": "node ../../common-libs/scripts/package-vsix.js",
         "copyFonts": "copyfiles -f ./node_modules/@wso2/font-wso2-vscode/dist/* ./resources/font-wso2-vscode/dist/",
         "rebuild": "pnpm run clean && pnpm run compile && pnpm run postbuild",
         "postbuild": "pnpm run copyFonts && pnpm run package && pnpm run copyVSIX",
@@ -200,4 +201,4 @@
         "@playwright/test": "~1.55.1",
         "@wso2/playwright-vscode-tester": "workspace:*"
     }
-}
+}

workspaces/bi/bi-extension/src/constants/index.ts

@@ -16,4 +16,9 @@
  * under the License.
  */
 
+import { BI_COMMANDS } from "@wso2/ballerina-core";
+
 // ADD ALL THE NON-SHARED BI ONLY ATTRIBUTES HERE.
+export const WI_EXTENSION_ID = 'wso2.wso2-integrator';
+export const WI_PROJECT_EXPLORER_VIEW_ID = 'wso2-integrator.explorer';
+export const BI_PROJECT_EXPLORER_VIEW_ID = BI_COMMANDS.PROJECT_EXPLORER;

workspaces/bi/bi-extension/src/project-explorer/activate.ts

@@ -20,27 +20,30 @@ import { SHARED_COMMANDS, BI_COMMANDS } from '@wso2/ballerina-core';
 import { ProjectExplorerEntry, ProjectExplorerEntryProvider } from './project-explorer-provider';
 import { ExtensionContext, TreeView, commands, window, workspace } from 'vscode';
 import { extension } from '../biExtentionContext';
+import { BI_PROJECT_EXPLORER_VIEW_ID, WI_PROJECT_EXPLORER_VIEW_ID } from '../constants';
 
 interface ExplorerActivationConfig {
 	context: ExtensionContext;
 	isBI: boolean;
 	isBallerinaPackage?: boolean;
 	isBallerinaWorkspace?: boolean;
 	isEmptyWorkspace?: boolean;
+	isInWI: boolean;
 }
 
 export function activateProjectExplorer(config: ExplorerActivationConfig) {
-	const { context, isBI, isBallerinaPackage, isBallerinaWorkspace, isEmptyWorkspace } = config;
+	const { context, isBI, isBallerinaPackage, isBallerinaWorkspace, isEmptyWorkspace, isInWI } = config;
 
 	if (extension.langClient && extension.biSupported) {
 		setLoadingStatus();
 	}
 
+	const treeviewId = isInWI ? WI_PROJECT_EXPLORER_VIEW_ID : BI_PROJECT_EXPLORER_VIEW_ID;
 	const projectExplorerDataProvider = new ProjectExplorerEntryProvider();
-	const projectTree = createProjectTree(projectExplorerDataProvider);
+	const projectTree = createProjectTree(projectExplorerDataProvider, treeviewId);
 
 	if (isBallerinaPackage || isBallerinaWorkspace) {
-		registerBallerinaCommands(projectExplorerDataProvider, isBI, isBallerinaWorkspace, isEmptyWorkspace);
+		registerBallerinaCommands(projectExplorerDataProvider, isBI, isInWI, isBallerinaWorkspace, isEmptyWorkspace);
 	}
 
 	handleVisibilityChangeEvents(
@@ -57,13 +60,14 @@ function setLoadingStatus() {
 	commands.executeCommand('setContext', 'BI.status', 'loading');
 }
 
-function createProjectTree(dataProvider: ProjectExplorerEntryProvider) {
-	return window.createTreeView(BI_COMMANDS.PROJECT_EXPLORER, { treeDataProvider: dataProvider });
+function createProjectTree(dataProvider: ProjectExplorerEntryProvider, treeviewId: string) {
+	return window.createTreeView(treeviewId, { treeDataProvider: dataProvider });
 }
 
 function registerBallerinaCommands(
 	dataProvider: ProjectExplorerEntryProvider,
 	isBI: boolean,
+	isInWI: boolean,
 	isBallerinaWorkspace?: boolean,
 	isEmptyWorkspace?: boolean
 ) {
@@ -77,7 +81,7 @@ function registerBallerinaCommands(
 		}
 	}
 	if (isBI) {
-		registerBICommands();
+		registerBICommands(isInWI);
 	}
 }
 
@@ -131,8 +135,9 @@ function handleNonBallerinaVisibility() {
 	commands.executeCommand(SHARED_COMMANDS.OPEN_BI_WELCOME);
 }
 
-function registerBICommands() {
-	commands.executeCommand(BI_COMMANDS.FOCUS_PROJECT_EXPLORER);
+function registerBICommands(isInWI) {
+	const treeViewId = isInWI ? WI_PROJECT_EXPLORER_VIEW_ID : BI_PROJECT_EXPLORER_VIEW_ID;
+	commands.executeCommand(`${treeViewId}.focus`);
 	commands.executeCommand(SHARED_COMMANDS.SHOW_VISUALIZER);
 	commands.executeCommand('setContext', 'BI.project', true);
 }

workspaces/bi/bi-extension/src/stateMachine.ts

@@ -20,12 +20,15 @@ import { assign, createMachine, interpret } from 'xstate';
 import { activateProjectExplorer } from './project-explorer/activate';
 import { extension } from './biExtentionContext';
 import { fetchProjectInfo, ProjectInfo } from './utils';
+import { WI_EXTENSION_ID } from './constants';
+import * as vscode from 'vscode';
 
 interface MachineContext {
     isBI: boolean;
     isBallerinaPackage?: boolean;
     isBallerinaWorkspace?: boolean;
     isEmptyWorkspace?: boolean;
+    isInWI: boolean;
 }
 
 const stateMachine = createMachine<MachineContext>({
@@ -34,7 +37,8 @@ const stateMachine = createMachine<MachineContext>({
     initial: 'initialize',
     predictableActionArguments: true,
     context: {
-        isBI: false
+        isBI: false,
+        isInWI: vscode.extensions.getExtension(WI_EXTENSION_ID) ? true : false
     },
     states: {
         initialize: {
@@ -71,7 +75,8 @@ const stateMachine = createMachine<MachineContext>({
                 isBI: context.isBI,
                 isBallerinaPackage: context.isBallerinaPackage,
                 isBallerinaWorkspace: context.isBallerinaWorkspace,
-                isEmptyWorkspace: context.isEmptyWorkspace
+                isEmptyWorkspace: context.isEmptyWorkspace,
+                isInWI: context.isInWI
             });
         }
     },

workspaces/common-libs/rpc-generator/index.js

@@ -324,14 +324,14 @@ const handlerFunction = handlerSourceFile.addFunction({
     }]
 });
 handleImportStatment(handlerSourceFile, 'vscode-messenger', 'Messenger');
-
 // Add statements to the function
 const managerObject = `const rpcManger = new ${managerClassName}();`
 handlerFunction.addStatements(managerObject);
 typeMethods.forEach(value => {
     handleMessengerTypes(handlerFunction, value, handlerSourceFile);
 })
 
+console.log(`Adding handler function: ${headerComment}...`);
 handleImportStatment(handlerSourceFile, './rpc-manager', managerClassName);
 
 // Format imports into new lines

workspaces/common-libs/rpc-generator/package.json

@@ -4,11 +4,11 @@
   "description": "Generate rpc-manager,rpc-handler and rpc-client ts files in relevant libraries",
   "main": "index.js",
   "config": {
-    "CORE_RPC_TYPE_FILE": "ai-panel/index.ts",
-    "CORE_RPC_TYPE_DIR": "../../ballerina/ballerina-core/",
-    "EXT_RPC_MANAGER_DIR": "../../ballerina/ballerina-extension/",
-    "RPC_CLIENT_DIR": "../../ballerina/ballerina-rpc-client/",
-    "CORE_MODULE_NAME": "@wso2/ballerina-core"
+    "CORE_RPC_TYPE_FILE": "main/index.ts",
+    "CORE_RPC_TYPE_DIR": "../../wi/wi-core/",
+    "EXT_RPC_MANAGER_DIR": "../../wi/wi-extension/",
+    "RPC_CLIENT_DIR": "../../wi/wi-rpc-client/",
+    "CORE_MODULE_NAME": "@wso2/wi-core"
   },
   "scripts": {
     "generate": "node index.js"