Merge "wso2-platform-1.0.26" into "stable/platform"

.github/workflows/build.yml

@@ -222,7 +222,7 @@ jobs:
           PLATFORM_DEV_DEVANT_ASGARDEO_CLIENT_ID: ${{ secrets.PLATFORM_DEV_DEVANT_ASGARDEO_CLIENT_ID }}
 
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.33.1
+        uses: aquasecurity/trivy-action@0.34.2
         with:
           scan-type: 'fs'
           scan-ref: '.'

.gitignore

@@ -87,3 +87,5 @@ TODO.md
 
 # AI evaluation results
 **/results
+
+cc_run_log.json

common/config/rush/.pnpmfile.cjs

@@ -28,7 +28,13 @@ module.exports = {
         if (deps['fast-xml-parser']) deps['fast-xml-parser'] = '5.3.8';
         if (deps['lodash']) deps['lodash'] = '4.17.23';
         if (deps['qs']) deps['qs'] = '6.14.2';
-        if (deps['hono']) deps['hono'] = '4.11.10';
+        if (deps['serialize-javascript']) deps['serialize-javascript'] = '7.0.3';
+        if (deps['@hono/node-server']) deps['@hono/node-server'] = '1.19.10';
+        if (deps['@tootallnate/once']) deps['@tootallnate/once'] = '3.0.1';
+        if (deps['dompurify']) deps['dompurify'] = '3.3.2';
+        if (deps['express-rate-limit']) deps['express-rate-limit'] = '8.2.2';
+        if (deps['hono']) deps['hono'] = '4.12.7';
+        if (deps['immutable']) deps['immutable'] = '3.8.3';
         if (deps['bn.js']) {
           deps['bn.js'] = deps['bn.js'].startsWith('^5') ? '5.2.3' : '4.12.3';
         }

workspaces/ballerina/ballerina-core/src/interfaces/extended-lang-client.ts

@@ -876,9 +876,11 @@ export interface BISourceCodeRequest {
 }
 
 export type BISourceCodeResponse = {
-    textEdits: {
+    textEdits?: {
         [key: string]: TextEdit[];
     };
+    errorMsg?: string;
+    stacktrace?: string;
 };
 
 export type BIDeleteByComponentInfoRequest = {
@@ -1468,6 +1470,11 @@ export interface Type {
     allowAdditionalFields?: boolean;
 }
 
+export interface SimpleType {
+    name: string;
+    imports?: Imports;
+}
+
 type ServiceFunctionKind = "RESOURCE" | "REMOTE" | "FUNCTION";
 
 export interface TypeFunctionModel {
@@ -1593,6 +1600,16 @@ export interface GetTypeResponse {
     type: Type;
 }
 
+export interface GetSimpleTypeOfExpressionRequest {
+    filePath: string;
+    position: LinePosition;
+    expression: string;
+}
+
+export interface GetSimpleTypeOfExpressionResponse {
+    type: SimpleType;
+}
+
 export interface JsonToTypeRequest {
     jsonString: string;
     typeName: string;
@@ -2044,6 +2061,7 @@ export interface BIInterface extends BaseLangClientInterface {
     getDesignModel: (params: BIDesignModelRequest) => Promise<BIDesignModelResponse>;
     getType: (params: GetTypeRequest) => Promise<GetTypeResponse>;
     getTypes: (params: GetTypesRequest) => Promise<GetTypesResponse>;
+    getSimpleTypeOfExpression: (params: GetSimpleTypeOfExpressionRequest) => Promise<GetSimpleTypeOfExpressionResponse>;
     updateType: (params: UpdateTypeRequest) => Promise<UpdateTypeResponse>;
     updateImports: (params: UpdateImportsRequest) => Promise<ImportsInfoResponse>;
     addFunction: (params: AddFunctionRequest) => Promise<AddImportItemResponse>;
@@ -2086,5 +2104,6 @@ export interface ExtendedLangClientInterface extends BIInterface {
     getDidOpenParams(): DidOpenParams;
     getProjectArtifacts(params: ProjectArtifactsRequest): Promise<ProjectArtifacts>;
     getProjectInfo(params: ProjectInfoRequest): Promise<ProjectInfo>;
+    getSimpleTypeOfExpression(params: GetSimpleTypeOfExpressionRequest): Promise<GetSimpleTypeOfExpressionResponse>;
     openConfigToml(params: OpenConfigTomlRequest): Promise<void>;
 }

workspaces/ballerina/ballerina-core/src/rpc-types/ai-panel/index.ts

@@ -81,7 +81,6 @@ export interface AIPanelAPI {
     addFilesToProject: (params: AddFilesToProjectRequest) => Promise<boolean>;
     isUserAuthenticated: () => Promise<boolean>;
     openAIPanel: (params: AIPanelPrompt) => Promise<void>;
-    isPlanModeFeatureEnabled: () => Promise<boolean>;
     // AI schema related functions
     getSemanticDiff: (params: SemanticDiffRequest) => Promise<SemanticDiffResponse>;
     getAffectedPackages: () => Promise<string[]>;

workspaces/ballerina/ballerina-core/src/rpc-types/ai-panel/interfaces.ts

@@ -28,7 +28,7 @@ import { ComponentInfo, DataMapperMetadata, Diagnostics, DMModel, ImportStatemen
 // ==================================
 export type AIPanelPrompt =
     | { type: 'command-template'; command: Command; templateId: TemplateId; text?: string; params?: Record<string, string>; metadata?: Record<string, any> }
-    | { type: 'text'; text: string; planMode: boolean; codeContext?: CodeContext }
+    | { type: 'text'; text: string; planMode: boolean; codeContext?: CodeContext; autoSubmit?: boolean }
     | undefined;
 
 export interface AIMachineSnapshot {

workspaces/ballerina/ballerina-core/src/rpc-types/ai-panel/rpc-type.ts

@@ -77,7 +77,6 @@ export const getGeneratedDocumentation: RequestType<DocGenerationRequest, void>
 export const addFilesToProject: RequestType<AddFilesToProjectRequest, boolean> = { method: `${_preFix}/addFilesToProject` };
 export const isUserAuthenticated: RequestType<void, boolean> = { method: `${_preFix}/isUserAuthenticated` };
 export const openAIPanel: RequestType<AIPanelPrompt, void> = { method: `${_preFix}/openAIPanel` };
-export const isPlanModeFeatureEnabled: RequestType<void, boolean> = { method: `${_preFix}/isPlanModeFeatureEnabled` };
 export const getSemanticDiff: RequestType<SemanticDiffRequest, SemanticDiffResponse> = { method: `${_preFix}/getSemanticDiff` };
 export const getAffectedPackages: NotificationType<void> = { method: `${_preFix}/getAffectedPackages` };
 export const isWorkspaceProject: RequestType<void, boolean> = { method: `${_preFix}/isWorkspaceProject` };

workspaces/ballerina/ballerina-core/src/rpc-types/bi-diagram/index.ts

@@ -98,7 +98,9 @@ import {
     BISearchNodesRequest,
     BISearchNodesResponse,
     BIDesignModelRequest,
-    BIFlowModelRequest
+    BIFlowModelRequest,
+    GetSimpleTypeOfExpressionRequest,
+    GetSimpleTypeOfExpressionResponse
 } from "../../interfaces/extended-lang-client";
 import {
     ProjectRequest,
@@ -181,6 +183,7 @@ export interface BIDiagramAPI {
     getDesignModel: (params: BIDesignModelRequest) => Promise<BIDesignModelResponse>;
     getTypes: (params: GetTypesRequest) => Promise<GetTypesResponse>;
     getType: (params: GetTypeRequest) => Promise<GetTypeResponse>;
+    getSimpleTypeOfExpression: (params: GetSimpleTypeOfExpressionRequest) => Promise<GetSimpleTypeOfExpressionResponse>;
     updateType: (params: UpdateTypeRequest) => Promise<UpdateTypeResponse>;
     updateTypes: (params: UpdateTypesRequest) => Promise<UpdateTypesResponse>;
     deleteType: (params: DeleteTypeRequest) => Promise<DeleteTypeResponse>;

workspaces/ballerina/ballerina-core/src/rpc-types/bi-diagram/interfaces.ts

@@ -218,6 +218,7 @@ export interface ValidateProjectFormRequest {
     projectPath: string;
     projectName: string;
     createDirectory: boolean;
+    createAsWorkspace?: boolean;
 }
 
 export interface ValidateProjectFormResponse {

workspaces/ballerina/ballerina-core/src/rpc-types/bi-diagram/rpc-type.ts

@@ -100,7 +100,9 @@ import {
     BISearchNodesResponse,
     BIDesignModelRequest,
     BIFlowModelRequest,
-    ExpressionTokensRequest
+    ExpressionTokensRequest,
+    GetSimpleTypeOfExpressionRequest,
+    GetSimpleTypeOfExpressionResponse
 } from "../../interfaces/extended-lang-client";
 import {
     ProjectRequest,
@@ -184,6 +186,7 @@ export const formDidClose: RequestType<FormDidCloseParams, void> = { method: `${
 export const getDesignModel: RequestType<BIDesignModelRequest, BIDesignModelResponse> = { method: `${_preFix}/getDesignModel` };
 export const getTypes: RequestType<GetTypesRequest, GetTypesResponse> = { method: `${_preFix}/getTypes` };
 export const getType: RequestType<GetTypeRequest, GetTypeResponse> = { method: `${_preFix}/getType` };
+export const getSimpleTypeOfExpression: RequestType<GetSimpleTypeOfExpressionRequest, GetSimpleTypeOfExpressionResponse> = { method: `${_preFix}/getSimpleTypeOfExpression` };
 export const updateType: RequestType<UpdateTypeRequest, UpdateTypeResponse> = { method: `${_preFix}/updateType` };
 export const updateTypes: RequestType<UpdateTypesRequest, UpdateTypesResponse> = { method: `${_preFix}/updateTypes` };
 export const deleteType: RequestType<DeleteTypeRequest, DeleteTypeResponse> = { method: `${_preFix}/deleteType` };

workspaces/ballerina/ballerina-core/src/rpc-types/connector-wizard/index.ts

@@ -26,7 +26,9 @@ import {
     PersistClientGenerateResponse,
     IntrospectDatabaseRequest,
     WSDLApiClientGenerationRequest,
-    WSDLApiClientGenerationResponse
+    WSDLApiClientGenerationResponse,
+    IntrospectCredentialsRequest,
+    IntrospectCredentialsResponse
 } from "./interfaces";
 
 export interface ConnectorWizardAPI {
@@ -35,4 +37,5 @@ export interface ConnectorWizardAPI {
     introspectDatabase: (params: IntrospectDatabaseRequest) => Promise<IntrospectDatabaseResponse>;
     persistClientGenerate: (params: PersistClientGenerateRequest) => Promise<PersistClientGenerateResponse>;
     generateWSDLApiClient: (params: WSDLApiClientGenerationRequest) => Promise<WSDLApiClientGenerationResponse>;
+    introspectCredentials: (params: IntrospectCredentialsRequest) => Promise<IntrospectCredentialsResponse>;
 }

workspaces/ballerina/ballerina-core/src/rpc-types/connector-wizard/interfaces.ts

@@ -17,7 +17,9 @@
  */
 
 import { BallerinaConnectorInfo, BallerinaConnectorsRequest, BallerinaConnector } from "../../interfaces/ballerina";
+import { Metadata } from "../../interfaces/bi";
 import { TextEdit } from "../../interfaces/extended-lang-client";
+import { PropertyModel } from "../../interfaces/service";
 
 export interface ConnectorRequest {
     id?: string
@@ -43,38 +45,46 @@ export interface ConnectorsResponse {
     error?: string;
 }
 
-export interface IntrospectDatabaseRequest {
+export interface IntrospectCredentialsRequest {
+    connection?: string;
     projectPath: string;
-    dbSystem: string;
-    host: string;
-    port: number;
-    database: string;
-    user: string;
-    password: string;
 }
 
-export interface IntrospectDatabaseResponse {
-    tables?: string[];
-    errorMsg?: string;
+export interface IntrospectCredentialsResponse {
+    data: {
+        metadata: Metadata;
+        properties: { [key: string]: PropertyModel };
+        targetModule?: string;
+        modelFilePath?: string;
+    };
 }
 
-export interface PersistClientGenerateRequest {
+export interface IntrospectDatabaseRequest {
     projectPath: string;
-    name: string;
-    dbSystem: string;
-    host: string;
-    port: number;
-    user: string;
-    password: string;
-    database: string;
-    selectedTables: string[];
-    module?: string;
+    metadata: Metadata;
+    properties?: { [key: string]: PropertyModel };
+    targetModule?: string;
+    modelFilePath?: string;
 }
 
-export interface PersistClientGenerateResponse {
-    source?: PersistSource;
+export interface IntrospectDatabaseResponse {
+    tables?: TableInfo[];
+    targetModule?: string;
+    modelFilePath?: string;
     errorMsg?: string;
-    stackTrace?: string;
+}
+export interface TableInfo {
+    table: string;
+    selected: boolean;
+    existing: boolean;
+}
+export interface PersistClientGenerateRequest {
+    projectPath: string;
+    targetModule?: string;
+    modelFilePath?: string;
+    connection?: string;
+    properties?: { [key: string]: PropertyModel };
+    tables: TableInfo[];
 }
 
 export interface PersistSource {
@@ -83,6 +93,11 @@ export interface PersistSource {
         [key: string]: TextEdit[];
     };
 }
+export interface PersistClientGenerateResponse {
+    source?: PersistSource;
+    errorMsg?: string;
+    stackTrace?: string;
+}
 
 export interface WSDLApiClientGenerationRequest {
     projectPath: string;

workspaces/ballerina/ballerina-core/src/rpc-types/connector-wizard/rpc-type.ts

@@ -27,7 +27,9 @@ import {
     PersistClientGenerateResponse,
     IntrospectDatabaseRequest,
     WSDLApiClientGenerationRequest,
-    WSDLApiClientGenerationResponse
+    WSDLApiClientGenerationResponse,
+    IntrospectCredentialsRequest,
+    IntrospectCredentialsResponse
 } from "./interfaces";
 import { RequestType } from "vscode-messenger-common";
 
@@ -37,3 +39,4 @@ export const getConnectors: RequestType<ConnectorsRequest, ConnectorsResponse> =
 export const introspectDatabase: RequestType<IntrospectDatabaseRequest, IntrospectDatabaseResponse> = { method: `${_preFix}/introspectDatabase` };
 export const persistClientGenerate: RequestType<PersistClientGenerateRequest, PersistClientGenerateResponse> = { method: `${_preFix}/persistClientGenerate` };
 export const generateWSDLApiClient: RequestType<WSDLApiClientGenerationRequest, WSDLApiClientGenerationResponse> = { method: `${_preFix}/generateWSDLApiClient` };
+export const introspectCredentials: RequestType<IntrospectCredentialsRequest, IntrospectCredentialsResponse> = { method: `${_preFix}/introspectCredentials` };

workspaces/ballerina/ballerina-core/src/rpc-types/platform-ext/index.ts

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-import { GetMarketplaceListReq,MarketplaceListResp, GetMarketplaceIdlReq, MarketplaceIdlResp, ConnectionListItem, GetConnectionsReq, DeleteLocalConnectionsConfigReq, GetMarketplaceItemReq, MarketplaceItem, GetConnectionItemReq, ConnectionDetailed, CreateLocalConnectionsConfigReq, CreateThirdPartyConnectionReq, CreateComponentConnectionReq, GetComponentsReq, ComponentKind } from "@wso2/wso2-platform-core"
+import { GetMarketplaceListReq,MarketplaceListResp, GetMarketplaceIdlReq, MarketplaceIdlResp, ConnectionListItem, GetConnectionsReq, DeleteLocalConnectionsConfigReq, GetMarketplaceItemReq, MarketplaceItem, GetConnectionItemReq, ConnectionDetailed, CreateLocalConnectionsConfigReq, CreateThirdPartyConnectionReq, CreateComponentConnectionReq, GetComponentsReq, ComponentKind, GetDatabaseServerReq, DatabaseAdminCredential, DatabaseServer, MarketplaceDatabaseListResp, DatabaseCredential, GetProjectEnvsReq, Environment, CreateDatabaseConnectionReq, GetDatabaseItemReq, ResolveConnectionSecretsReq, ResolveConnectionSecretsResp } from "@wso2/wso2-platform-core"
 import { DeleteDevantTempConfigReq, GenerateCustomConnectorFromOASReq, GenerateCustomConnectorFromOASResp, AddDevantTempConfigReq, AddDevantTempConfigResp, ReplaceDevantTempConfigValuesReq, RegisterDevantMarketplaceServiceReq, InitializeDevantOASConnectionReq, InitializeDevantOASConnectionResp } from "./interfaces";
 export * from "./rpc-type"
 export * from "./utils"
@@ -29,11 +29,20 @@ export interface PlatformExtAPI {
     addDevantTempConfig: (params: AddDevantTempConfigReq) => Promise<AddDevantTempConfigResp>
     deleteDevantTempConfigs: (params: DeleteDevantTempConfigReq) => Promise<void>
     replaceDevantTempConfigValues: (params: ReplaceDevantTempConfigValuesReq) => Promise<void>
+    setConnectedToDevant: (connected: boolean) => void;
+    setSelectedComponent: (componentId: string) => void;
+    setSelectedEnv: (envId: string) => void;
     // Platform ext proxies
     createThirdPartyConnection: (params: CreateThirdPartyConnectionReq) => Promise<ConnectionDetailed>
     createInternalConnection: (params: CreateComponentConnectionReq) => Promise<ConnectionDetailed>
     registerDevantMarketplaceService: (params: RegisterDevantMarketplaceServiceReq) => Promise<MarketplaceItem>
     getMarketplaceItems: (params: GetMarketplaceListReq) => Promise<MarketplaceListResp>;
+    getMarketplaceDatabases: (params: { orgId: string }) => Promise<MarketplaceDatabaseListResp>;
+    getMarketplaceDatabaseItem: (params: GetDatabaseItemReq) => Promise<MarketplaceItem>;
+    getDatabaseServer: (params: GetDatabaseServerReq) => Promise<DatabaseServer>;
+    getDatabaseAdminCredential: (params: GetDatabaseServerReq) => Promise<DatabaseAdminCredential>;
+    getDatabaseCredentials: (params: GetDatabaseServerReq) => Promise<DatabaseCredential[]>;
+    createDatabaseConnection: (params: CreateDatabaseConnectionReq) => Promise<ConnectionDetailed>;
     getMarketplaceItem: (params: GetMarketplaceItemReq) => Promise<MarketplaceItem>;
     getMarketplaceIdl: (params: GetMarketplaceIdlReq) => Promise<MarketplaceIdlResp>;
     getConnections: (params: GetConnectionsReq) => Promise<ConnectionListItem[]>;
@@ -42,9 +51,8 @@ export interface PlatformExtAPI {
     deleteLocalConnectionsConfig: (params: DeleteLocalConnectionsConfigReq) => void;
     getDevantConsoleUrl: () => Promise<string>;
     refreshConnectionList: () => Promise<void>;
-    setConnectedToDevant: (connected: boolean) => void;
-    setSelectedComponent: (componentId: string) => void;
-    setSelectedEnv: (envId: string) => void;
+    getProjectEnvs: (params: GetProjectEnvsReq) => Promise<Environment[]>;
+    resolveConnectionSecrets: (params: ResolveConnectionSecretsReq) => Promise<ResolveConnectionSecretsResp>;
     deployIntegrationInDevant: () => void;
     createConnectionConfig: (params: CreateLocalConnectionsConfigReq) => Promise<string>;
 }

workspaces/ballerina/ballerina-core/src/rpc-types/platform-ext/interfaces.ts

@@ -88,6 +88,7 @@ export interface PlatformExtConnectionState {
 }
 
 export interface PlatformExtState {
+    isExtInstalled?: boolean;
     isLoggedIn: boolean;
     userInfo: UserInfo | null;
     hasPossibleComponent?: boolean;
@@ -100,31 +101,14 @@ export interface PlatformExtState {
     devantConns?: PlatformExtConnectionState;
 }
 
-export enum DevantConnectionFlow {
-    // Create related flows
-    CREATE_INTERNAL_OAS = "CREATE_INTERNAL_OAS",
-    CREATE_INTERNAL_OTHER = "CREATE_INTERNAL_OTHER",
-    CREATE_INTERNAL_OTHER_SELECT_BI_CONNECTOR = "CREATE_INTERNAL_OTHER_SELECT_BI_CONNECTOR",
-    CREATE_THIRD_PARTY_OAS = "CREATE_THIRD_PARTY_OAS",
-    CREATE_THIRD_PARTY_OTHER = "CREATE_THIRD_PARTY_OTHER",
-    CREATE_THIRD_PARTY_OTHER_SELECT_BI_CONNECTOR = "CREATE_THIRD_PARTY_OTHER_SELECT_BI_CONNECTOR",
-    REGISTER_CREATE_THIRD_PARTY_FROM_BI_CONNECTOR = "REGISTER_CREATE_THIRD_PARTY_FROM_BI_CONNECTOR",
-    REGISTER_CREATE_THIRD_PARTY_FROM_OAS = "REGISTER_CREATE_THIRD_PARTY_FROM_OAS",
-    // Import related flows
-    IMPORT_INTERNAL_OAS = "IMPORT_INTERNAL_OAS",
-    IMPORT_INTERNAL_OTHER = "IMPORT_INTERNAL_OTHER",
-    IMPORT_INTERNAL_OTHER_SELECT_BI_CONNECTOR = "IMPORT_INTERNAL_OTHER_SELECT_BI_CONNECTOR",
-    IMPORT_THIRD_PARTY_OAS = "IMPORT_THIRD_PARTY_OAS",
-    IMPORT_THIRD_PARTY_OTHER = "IMPORT_THIRD_PARTY_OTHER",
-    IMPORT_THIRD_PARTY_OTHER_SELECT_BI_CONNECTOR = "IMPORT_THIRD_PARTY_OTHER_SELECT_BI_CONNECTOR",
-}
-
 export interface DevantTempConfig {
+    /** The id matching the key in devant side */
     id: string;
+    /** The unique identifier in ballerina code */
     name: string;
     value: string;
     isSecret: boolean;
     node?: ModuleVarDecl;
     description?: string;
-    type?: string;
+    type?: "string" | "int";
 }