Merge "ballerina-integrator-1.3.2" into "release-ballerina"

workspaces/ballerina/ballerina-core/src/interfaces/data-mapper.ts

@@ -24,7 +24,14 @@ export enum TypeKind {
     Record = "record",
     Array = "array",
     String = "string",
+    StringChar = "string:Char",
     Int = "int",
+    IntSigned8 = "int:Signed8",
+    IntSigned16 = "int:Signed16",
+    IntSigned32 = "int:Signed32",
+    IntUnsigned8 = "int:Unsigned8",
+    IntUnsigned16 = "int:Unsigned16",
+    IntUnsigned32 = "int:Unsigned32",
     Float = "float",
     Decimal = "decimal",
     Boolean = "boolean",
@@ -115,6 +122,7 @@ export interface ExpandedDMModel {
     rootViewId: string;
     query?: Query;
     mapping_fields?: Record<string, any>;
+    triggerRefresh?: boolean;
 }
 
 export interface DMModel {
@@ -127,6 +135,7 @@ export interface DMModel {
     query?: Query;
     focusInputs?: Record<string, IOTypeField>;
     mapping_fields?: Record<string, any>;
+    triggerRefresh?: boolean;
 }
 
 export interface ModelState {

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

@@ -470,6 +470,10 @@ export interface MapWithFnRequest {
     subMappingName?: string;
 }
 
+export interface ClearTypeCacheResponse {
+    success: boolean;
+}
+
 export interface GetDataMapperCodedataRequest {
     filePath: string;
     codedata: CodeData;

workspaces/ballerina/ballerina-core/src/rpc-types/data-mapper/index.ts

@@ -41,7 +41,8 @@ import {
     DMModelRequest,
     ProcessTypeReferenceResponse,
     ProcessTypeReferenceRequest,
-    ExpandedDMModelResponse
+    ExpandedDMModelResponse,
+    ClearTypeCacheResponse
 } from "../../interfaces/extended-lang-client";
 
 export interface DataMapperAPI {
@@ -64,4 +65,5 @@ export interface DataMapperAPI {
     getProperty: (params: PropertyRequest) => Promise<PropertyResponse>;
     getExpandedDMFromDMModel: (params: DMModelRequest) => Promise<ExpandedDMModelResponse>;
     getProcessTypeReference: (params: ProcessTypeReferenceRequest) => Promise<ProcessTypeReferenceResponse>;
+    clearTypeCache: () => Promise<ClearTypeCacheResponse>;
 }

workspaces/ballerina/ballerina-core/src/rpc-types/data-mapper/rpc-type.ts

@@ -43,7 +43,8 @@ import {
     DMModelRequest,
     ProcessTypeReferenceResponse,
     ProcessTypeReferenceRequest,
-    ExpandedDMModelResponse
+    ExpandedDMModelResponse,
+    ClearTypeCacheResponse
 } from "../../interfaces/extended-lang-client";
 import { RequestType } from "vscode-messenger-common";
 
@@ -67,3 +68,4 @@ export const getAllDataMapperSource: RequestType<AllDataMapperSourceRequest, Dat
 export const getProperty: RequestType<PropertyRequest, PropertyResponse> = { method: `${_preFix}/getProperty` };
 export const getExpandedDMFromDMModel: RequestType<DMModelRequest, ExpandedDMModelResponse> = { method: `${_preFix}/getExpandedDMFromDMModel` };
 export const getProcessTypeReference: RequestType<ProcessTypeReferenceRequest, ProcessTypeReferenceResponse> = { method: `${_preFix}/getProcessTypeReference` };
+export const clearTypeCache: RequestType<void, ClearTypeCacheResponse> = { method: `${_preFix}/clearTypeCache` };

workspaces/ballerina/ballerina-extension/package.json

@@ -2,7 +2,7 @@
     "name": "ballerina",
     "displayName": "Ballerina",
     "description": "Ballerina Language support, debugging, graphical visualization, AI-based data-mapping and many more.",
-    "version": "5.4.1",
+    "version": "5.4.2",
     "publisher": "wso2",
     "icon": "resources/images/ballerina.png",
     "homepage": "https://wso2.com/ballerina/vscode/docs",

workspaces/ballerina/ballerina-extension/src/core/extended-language-client.ts

@@ -259,7 +259,8 @@ import {
     onMigrationToolLogs,
     GetMigrationToolsResponse,
     DeleteSubMappingRequest,
-    DeleteClauseRequest
+    DeleteClauseRequest,
+    ClearTypeCacheResponse
 } from "@wso2/ballerina-core";
 import { BallerinaExtension } from "./index";
 import { debug, handlePullModuleProgress } from "../utils";
@@ -357,6 +358,7 @@ enum EXTENDED_APIS {
     DATA_MAPPER_CODEDATA = 'dataMapper/nodePosition',
     DATA_MAPPER_SUB_MAPPING_CODEDATA = 'dataMapper/subMapping',
     DATA_MAPPER_PROPERTY = 'dataMapper/fieldPosition',
+    DATA_MAPPER_CLEAR_TYPE_CACHE = 'dataMapper/clearTypeCache',
     VIEW_CONFIG_VARIABLES = 'configEditor/getConfigVariables',
     UPDATE_CONFIG_VARIABLES = 'configEditor/updateConfigVariables',
     VIEW_CONFIG_VARIABLES_V2 = 'configEditorV2/getConfigVariables',
@@ -807,6 +809,10 @@ export class ExtendedLangClient extends LanguageClient implements ExtendedLangCl
         return this.sendRequest<PropertyResponse>(EXTENDED_APIS.DATA_MAPPER_PROPERTY, params);
     }
 
+    async clearTypeCache(): Promise<ClearTypeCacheResponse> {
+        return this.sendRequest<ClearTypeCacheResponse>(EXTENDED_APIS.DATA_MAPPER_CLEAR_TYPE_CACHE);
+    }
+
     async getGraphqlModel(params: GraphqlDesignServiceParams): Promise<GraphqlDesignService | NOT_SUPPORTED_TYPE> {
         return this.sendRequest<GraphqlDesignService>(EXTENDED_APIS.GRAPHQL_DESIGN_MODEL, params);
     }

workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/rpc-handler.ts

@@ -25,6 +25,7 @@ import {
     addSubMapping,
     AddSubMappingRequest,
     AllDataMapperSourceRequest,
+    clearTypeCache,
     convertToQuery,
     ConvertToQueryRequest,
     DataMapperModelRequest,
@@ -80,4 +81,5 @@ export function registerDataMapperRpcHandlers(messenger: Messenger) {
     messenger.onRequest(getProperty, (args: PropertyRequest) => rpcManger.getProperty(args));
     messenger.onRequest(getExpandedDMFromDMModel, (args: DMModelRequest) => rpcManger.getExpandedDMFromDMModel(args));
     messenger.onRequest(getProcessTypeReference, (args: ProcessTypeReferenceRequest) => rpcManger.getProcessTypeReference(args));
+    messenger.onRequest(clearTypeCache, () => rpcManger.clearTypeCache());
 }

workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/rpc-manager.ts

@@ -22,6 +22,7 @@ import {
     AddClausesRequest,
     AddSubMappingRequest,
     AllDataMapperSourceRequest,
+    ClearTypeCacheResponse,
     ConvertToQueryRequest,
     DataMapperAPI,
     DataMapperModelRequest,
@@ -409,4 +410,15 @@ export class DataMapperRpcManager implements DataMapperAPI {
                 });
         });
     }
+
+    async clearTypeCache(): Promise<ClearTypeCacheResponse> {
+        return new Promise(async (resolve) => {
+            await StateMachine
+                .langClient()
+                .clearTypeCache()
+                .then((resp) => {
+                    resolve(resp);
+                });
+        });
+    }
 }

workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/utils.ts

@@ -517,7 +517,8 @@ export function expandDMModel(
         mappings: model.mappings,
         query: model.query,
         source: "",
-        rootViewId
+        rootViewId,
+        triggerRefresh: model.triggerRefresh
     };
 }
 

workspaces/ballerina/ballerina-extension/src/views/visualizer/webview.ts

@@ -68,7 +68,7 @@ export class VisualizerWebview {
             const documentUri = document.document.uri.toString();
             const isDocumentUnderProject = documentUri.includes(projectUri);
             // Reset visualizer the undo-redo stack if user did changes in the editor
-            if (isOpened && isDocumentUnderProject) {
+            if (isOpened && isDocumentUnderProject && !this._panel?.active) {
                 undoRedoManager.reset();
             }
 

workspaces/ballerina/ballerina-rpc-client/src/rpc-clients/data-mapper/rpc-client.ts

@@ -22,6 +22,7 @@ import {
     AddClausesRequest,
     AddSubMappingRequest,
     AllDataMapperSourceRequest,
+    ClearTypeCacheResponse,
     ConvertToQueryRequest,
     DMModelRequest,
     DataMapperAPI,
@@ -48,6 +49,7 @@ import {
     addClauses,
     addNewArrayElement,
     addSubMapping,
+    clearTypeCache,
     convertToQuery,
     deleteClause,
     deleteMapping,
@@ -150,4 +152,8 @@ export class DataMapperRpcClient implements DataMapperAPI {
     getProcessTypeReference(params: ProcessTypeReferenceRequest): Promise<ProcessTypeReferenceResponse> {
         return this._messenger.sendRequest(getProcessTypeReference, HOST_EXTENSION, params);
     }
+
+    clearTypeCache(): Promise<ClearTypeCacheResponse> {
+        return this._messenger.sendRequest(clearTypeCache, HOST_EXTENSION);
+    }
 }

workspaces/ballerina/ballerina-visualizer/src/Hooks.tsx

@@ -18,6 +18,7 @@
 import { useQuery } from '@tanstack/react-query';
 import { useRpcContext } from '@wso2/ballerina-rpc-client';
 import { DMViewState, LinePosition } from '@wso2/ballerina-core';
+import { useRef } from 'react';
 
 export const useDataMapperModel = (
     filePath: string,
@@ -28,6 +29,8 @@ export const useDataMapperModel = (
     const viewId = viewState?.viewId;
     const codedata = viewState?.codedata;
 
+    const triggerRefresh = useRef<boolean>(false);
+
     const getDMModel = async () => {
         try {
             const modelParams = {
@@ -43,6 +46,11 @@ export const useDataMapperModel = (
                 .getDataMapperRpcClient()
                 .getDataMapperModel(modelParams);
 
+            if (triggerRefresh.current) {
+                res.mappingsModel.triggerRefresh = true;
+                triggerRefresh.current = false;
+            }
+
             console.log('>>> [Data Mapper] Model:', res);
             return res.mappingsModel;
         } catch (error) {
@@ -57,10 +65,15 @@ export const useDataMapperModel = (
         isError,
         refetch
     } = useQuery({
-        queryKey: ['getDMModel', { codedata, viewId }],
-        queryFn: () => getDMModel(),
+        queryKey: ['getDMModel', codedata, viewId],
+        queryFn: getDMModel,
         networkMode: 'always'
     });
 
-    return {model, isFetching, isError, refetch};
+    const refreshDMModel = async () => {
+        triggerRefresh.current = true;
+        await refetch();
+    };
+
+    return { model, isFetching, isError, refreshDMModel };
 };