Merge branch 'main' into multi-project

Author: kanushka

common/config/rush/pnpm-lock.yaml

@@ -14,7 +14,8 @@
             "@eslint/plugin-kit": "^0.3.4",
             "on-headers": "^1.1.0",
             "form-data": "^4.0.4",
-            "tmp": "^0.2.4"
+            "tmp": "^0.2.4",
+            "express": "^4.22.1"
         }
     },
     "scripts": {

package.json

@@ -1190,14 +1190,15 @@
     "dependencies": {
         "@ai-sdk/amazon-bedrock": "^3.0.25",
         "@ai-sdk/anthropic": "^2.0.20",
+        "@iarna/toml": "^2.2.5",
         "@types/lodash": "^4.14.200",
         "@vscode/test-electron": "^2.5.2",
         "@vscode/vsce": "^3.7.0",
         "@wso2/ballerina-core": "workspace:*",
         "@wso2/ballerina-visualizer": "workspace:*",
-        "@wso2/trace-visualizer": "workspace:*",
         "@wso2/font-wso2-vscode": "workspace:*",
         "@wso2/syntax-tree": "workspace:*",
+        "@wso2/trace-visualizer": "workspace:*",
         "@wso2/wso2-platform-core": "workspace:*",
         "ai": "^5.0.56",
         "cors-anywhere": "^0.4.4",
@@ -1212,8 +1213,8 @@
         "node-fetch": "^3.3.2",
         "node-schedule": "^2.1.1",
         "portfinder": "^1.0.32",
+        "protobufjs": "^7.2.5",
         "source-map-support": "^0.5.21",
-        "toml": "^3.0.0",
         "unzipper": "~0.12.3",
         "uuid": "^11.1.0",
         "vscode-debugadapter": "^1.51.0",
@@ -1228,8 +1229,7 @@
         "vscode-uri": "^3.0.8",
         "xml-js": "^1.6.11",
         "xstate": "^4.38.3",
-        "zod": "^4.1.8",
-        "protobufjs": "^7.2.5"
+        "zod": "^4.1.8"
     },
     "devDependencies": {
         "@sentry/webpack-plugin": "^1.20.1",
@@ -1245,7 +1245,7 @@
         "copyfiles": "^2.4.1",
         "cross-env": "^7.0.3",
         "decache": "^4.6.2",
-        "express": "^4.18.2",
+        "express": "^4.22.1",
         "istanbul": "^0.4.5",
         "js-yaml": "^4.1.1",
         "jwt-decode": "^3.1.2",

workspaces/ballerina/ballerina-extension/package.json

@@ -17,7 +17,7 @@
  */
 
 import { debug } from "../../utils/logger";
-import toml from "toml";
+import { parse } from "@iarna/toml";
 import { CompletionItem, CompletionItemKind, Position, TextDocument, Uri } from "vscode";
 import { BallerinaExtension } from "../../core";
 import { findPropertyValues, getConfigValue, getCurrentBallerinaProjectFromContext } from "./configGenerator";
@@ -33,7 +33,7 @@ export const typeOfComment = 'Type of';
  */
 export function parseTomlToConfig(tomlContent: string): object {
     try {
-        return toml.parse(tomlContent);
+        return parse(tomlContent);
     } catch (error) {
         debug("Error while parsing the Config.toml file content: " + error);
     }

workspaces/ballerina/ballerina-extension/src/features/config-generator/utils.ts

@@ -17,7 +17,7 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
-import { parse } from 'toml';
+import { parse, stringify } from '@iarna/toml';
 import { OTLP_PORT } from './constants';
 
 /**
@@ -145,7 +145,7 @@ function updateOrAddSection(content: string, sectionName: string, values: Record
     // Build the new section content
     let sectionLines: string[] = [sectionHeader];
     for (const [key, value] of Object.entries(values)) {
-        const formattedValue = typeof value === 'string' ? `"${value}"` : String(value);
+        const formattedValue = stringify.value(value);
         sectionLines.push(`${key} = ${formattedValue}`);
     }
     const sectionContent = sectionLines.join('\n');

workspaces/ballerina/ballerina-extension/src/features/tracing/utils.ts

@@ -41,6 +41,7 @@ import {
     LoginMethod,
     MetadataWithAttachments,
     OperationType,
+    PackageTomlValues,
     PostProcessRequest,
     PostProcessResponse,
     ProcessContextTypeCreationRequest,
@@ -64,7 +65,7 @@ import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as os from 'os';
 import path from "path";
-import { parse } from 'toml';
+import { parse } from "@iarna/toml";
 import { workspace } from 'vscode';
 
 import { isNumber } from "lodash";
@@ -812,8 +813,8 @@ async function getCurrentProjectSource(requestType: OperationType, projectPath?:
         const tomlContent = await fs.promises.readFile(ballerinaTomlPath, 'utf-8');
         // Simple parsing to extract the package.name field
         try {
-            const tomlObj = parse(tomlContent);
-            packageName = tomlObj.package.name;
+            const tomlObj = parse(tomlContent) as Partial<PackageTomlValues>;
+            packageName = tomlObj?.package?.name;
         } catch (error) {
             packageName = '';
         }

workspaces/ballerina/ballerina-extension/src/rpc-managers/ai-panel/rpc-manager.ts

@@ -265,8 +265,9 @@ export class CommonRpcManager implements CommonRPCAPI {
         return extension.ballerinaExtInstance.isNPSupported;
     }
 
-    async getCurrentProjectTomlValues(): Promise<PackageTomlValues> {
-        return getProjectTomlValues(StateMachine.context().projectPath);
+    async getCurrentProjectTomlValues(): Promise<Partial<PackageTomlValues>> {
+        const tomlValues = await getProjectTomlValues(StateMachine.context().projectPath);
+        return tomlValues ?? {};  
     }
 
     async getWorkspaceType(): Promise<WorkspaceTypeResponse> {

workspaces/ballerina/ballerina-extension/src/rpc-managers/common/rpc-manager.ts

@@ -38,7 +38,7 @@ import { applyModifications, modifyFileContent, writeBallerinaFileDidOpen } from
 import { ModulePart, STKindChecker } from "@wso2/syntax-tree";
 import { URI } from "vscode-uri";
 import { debug } from "./logger";
-import { parse } from "toml";
+import { parse } from "@iarna/toml";
 import { getProjectTomlValues } from "./config";
 
 export const README_FILE = "readme.md";
@@ -363,8 +363,8 @@ function addToWorkspaceToml(workspacePath: string, packageName: string) {
 
     try {
         const ballerinaTomlContent = fs.readFileSync(ballerinaTomlPath, 'utf8');
-        const tomlData: WorkspaceTomlValues = parse(ballerinaTomlContent);
-        const existingPackages: string[] = tomlData.workspace?.packages || [];
+        const tomlData = parse(ballerinaTomlContent) as Partial<WorkspaceTomlValues>;
+        const existingPackages: string[] = tomlData?.workspace?.packages ?? [];
 
         if (existingPackages.includes(packageName)) {
             return; // Package already exists
@@ -388,8 +388,8 @@ export function deleteProjectFromWorkspace(workspacePath: string, packagePath: s
 
     try {
         const ballerinaTomlContent = fs.readFileSync(ballerinaTomlPath, 'utf8');
-        const tomlData: WorkspaceTomlValues = parse(ballerinaTomlContent);
-        const existingPackages: string[] = tomlData.workspace?.packages || [];
+        const tomlData = parse(ballerinaTomlContent) as Partial<WorkspaceTomlValues>;
+        const existingPackages: string[] = tomlData?.workspace?.packages ?? [];
 
         if (!existingPackages.includes(relativeProjectPath)) {
             return; // Package not found

workspaces/ballerina/ballerina-extension/src/utils/bi.ts

@@ -21,7 +21,7 @@ import { BallerinaExtension } from '../core';
 import { WorkspaceConfiguration, workspace, Uri, RelativePattern } from 'vscode';
 import * as fs from 'fs';
 import * as path from 'path';
-import { parse } from 'toml';
+import { parse } from '@iarna/toml';
 
 export enum VERSION {
     BETA = 'beta',
@@ -303,25 +303,25 @@ export function getOrgPackageName(projectPath: string): { orgName: string, packa
     }
 }
 
-export async function getProjectTomlValues(projectPath: string): Promise<PackageTomlValues | undefined> {
+export async function getProjectTomlValues(projectPath: string): Promise<Partial<PackageTomlValues> | undefined> {
     const ballerinaTomlPath = path.join(projectPath, 'Ballerina.toml');
     if (fs.existsSync(ballerinaTomlPath)) {
         const tomlContent = await fs.promises.readFile(ballerinaTomlPath, 'utf-8');
         try {
-            return parse(tomlContent);
+            return parse(tomlContent) as Partial<PackageTomlValues>;
         } catch (error) {
             console.error("Failed to load Ballerina.toml content for project at path: ", projectPath, error);
             return;
         }
     }
 }
 
-export async function getWorkspaceTomlValues(workspacePath: string): Promise<WorkspaceTomlValues | undefined> {
+export async function getWorkspaceTomlValues(workspacePath: string): Promise<Partial<WorkspaceTomlValues> | undefined> {
     const ballerinaTomlPath = path.join(workspacePath, 'Ballerina.toml');
     if (fs.existsSync(ballerinaTomlPath)) {
         const tomlContent = await fs.promises.readFile(ballerinaTomlPath, 'utf-8');
         try {
-            return parse(tomlContent);
+            return parse(tomlContent) as Partial<WorkspaceTomlValues>;
         } catch (error) {
             console.error("Failed to load Ballerina.toml content for workspace at path: ", workspacePath, error);
             return;

workspaces/ballerina/ballerina-extension/src/utils/config.ts

@@ -21,9 +21,9 @@
         "storybook:setup": "node tools/setup-storybook.js"
     },
     "dependencies": {
+        "@date-io/date-fns": "^3.2.1",
         "@wso2/ballerina-core": "workspace:*",
         "@wso2/syntax-tree": "workspace:*",
-        "@date-io/date-fns": "^3.2.1",
         "classnames": "^2.5.1",
         "clipboard-copy": "^4.0.1",
         "clsx": "^2.1.1",
@@ -38,14 +38,14 @@
         "lodash.camelcase": "^4.3.0",
         "lodash.clonedeep": "^4.5.0",
         "lodash.debounce": "^4.0.8",
+        "monaco-editor": "0.52.2",
         "react": "18.2.0",
         "react-dom": "18.2.0",
         "react-intl": "^7.1.11",
         "react-lottie": "^1.2.10",
         "react-zoom-pan-pinch": "^3.7.0",
         "uuid": "^11.1.0",
-        "vscode-languageserver-protocol": "^3.17.5",
-        "monaco-editor": "0.52.2"
+        "vscode-languageserver-protocol": "^3.17.5"
     },
     "devDependencies": {
         "@babel/core": "^7.27.1",
@@ -73,6 +73,7 @@
         "copy-webpack-plugin": "^13.0.0",
         "copyfiles": "^2.4.1",
         "css-loader": "^7.1.2",
+        "express": "^4.22.1",
         "file-loader": "^6.2.0",
         "fork-ts-checker-webpack-plugin": "^9.1.0",
         "glob": "^11.1.0",
@@ -101,8 +102,7 @@
         "typescript": "5.8.3",
         "webpack": "^5.99.8",
         "webpack-cli": "^6.0.1",
-        "webpack-dev-server": "^5.2.1",
-        "express": "^4.21.2"
+        "webpack-dev-server": "^5.2.1"
     },
     "repository": {
         "type": "git",