Merge pull request #38 from YasithD/inline-data-mapper-sync

Sync main to ballerina-inline-data-mapper

Author: madushajg

common/scripts/env-webpack-helper.js

@@ -23,37 +23,31 @@
  * 3. Only define variables that are explicitly declared in .env file
  * 
  * @param {Object} env - Parsed environment variables from .env file (from dotenv.config().parsed)
- * @returns {Object} Environment variables object ready for webpack.DefinePlugin
+ * @returns {Object} Object containing envKeys for webpack.DefinePlugin and missingVars array
  */
 function createEnvDefinePlugin(env) {
-
-  const envKeys = Object.create(null);
-  const missingVars = [];
-
-  if (env) {
-    Object.entries(env).forEach(([key, value]) => {
-      if (value !== undefined && value !== '') {
-        envKeys[`process.env.${key}`] = JSON.stringify(value);
-      }
-      else if (process.env[key] !== undefined && process.env[key] !== '') {
-        envKeys[`process.env.${key}`] = JSON.stringify(process.env[key]);
-      }
-      else {
-        missingVars.push(key);
-      }
-    });
-  }
-
-  if (missingVars.length > 0) {
-    throw new Error(
-      `Missing required environment variables: ${missingVars.join(', ')}\n` +
-      `Please provide values in either .env file or runtime environment.\n`
-    );
+  
+    const envKeys = Object.create(null);
+    const missingVars = [];
+  
+    if (env) {
+      Object.entries(env).forEach(([key, value]) => {
+        if (value !== undefined && value !== '') {
+          envKeys[`process.env.${key}`] = JSON.stringify(value);
+        }
+        else if (process.env[key] !== undefined && process.env[key] !== '') {
+          envKeys[`process.env.${key}`] = JSON.stringify(process.env[key]);
+        }
+        else {
+          missingVars.push(key);
+        }
+      });
+    }
+  
+    return { envKeys, missingVars };
   }
-
-  return envKeys;
-}
-
-module.exports = {
-  createEnvDefinePlugin
-}; 
+  
+  module.exports = {
+    createEnvDefinePlugin
+  }; 
+  

rush.json

@@ -38,7 +38,7 @@
    * LTS schedule: https://nodejs.org/en/about/releases/
    * LTS versions: https://nodejs.org/en/download/releases/
    */
-  "nodeSupportedVersionRange": ">=20.0.0 <=22.16.0",
+  "nodeSupportedVersionRange": ">=20.0.0 <23.0.0",
   /**
    * If the version check above fails, Rush will display a message showing the current
    * node version and the supported version range. You can use this setting to provide

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

@@ -1433,6 +1433,24 @@ export interface ResourceSourceCodeResponse {
         [key: string]: TextEdit[];
     };
 }
+
+export interface ResourceReturnTypesRequest {
+    filePath?: string;
+    context?: string;
+}
+
+export interface ResponseCode {
+    category: string;
+    label: string;
+    type: string;
+    statusCode: string;
+    hasBody?: boolean;
+}
+export interface ResourceReturnTypesResponse {
+    completions: ResponseCode[];
+}
+
+
 // <-------- Service Designer Related ------->
 
 
@@ -1647,6 +1665,7 @@ export interface BIInterface extends BaseLangClientInterface {
     getHttpResourceModel: (params: HttpResourceModelRequest) => Promise<HttpResourceModelResponse>;
     addResourceSourceCode: (params: FunctionSourceCodeRequest) => Promise<ResourceSourceCodeResponse>;
     addFunctionSourceCode: (params: FunctionSourceCodeRequest) => Promise<ResourceSourceCodeResponse>;
+    getResourceReturnTypes: (params: ResourceReturnTypesRequest) => Promise<ResourceReturnTypesResponse>;
 
     // Function APIs
     getFunctionNode: (params: FunctionNodeRequest) => Promise<FunctionNodeResponse>;

workspaces/ballerina/ballerina-core/src/rpc-types/service-designer/index.ts

@@ -17,7 +17,7 @@
  */
 
 import { UpdatedArtifactsResponse } from "../../interfaces/bi";
-import { ListenerModelRequest, ListenerModelResponse, ServiceModelRequest, ServiceModelResponse, ServiceModelFromCodeRequest, ServiceModelFromCodeResponse, HttpResourceModelRequest, HttpResourceModelResponse, FunctionSourceCodeRequest, ListenerSourceCodeRequest, ListenersRequest, ListenersResponse, ServiceSourceCodeRequest, ListenerModelFromCodeRequest, ListenerModelFromCodeResponse, TriggerModelsRequest, TriggerModelsResponse, FunctionModelRequest, FunctionModelResponse } from "../../interfaces/extended-lang-client";
+import { ListenerModelRequest, ListenerModelResponse, ServiceModelRequest, ServiceModelResponse, ServiceModelFromCodeRequest, ServiceModelFromCodeResponse, HttpResourceModelRequest, HttpResourceModelResponse, FunctionSourceCodeRequest, ListenerSourceCodeRequest, ListenersRequest, ListenersResponse, ServiceSourceCodeRequest, ListenerModelFromCodeRequest, ListenerModelFromCodeResponse, TriggerModelsRequest, TriggerModelsResponse, FunctionModelRequest, FunctionModelResponse, ResourceReturnTypesRequest, ResourceReturnTypesResponse } from "../../interfaces/extended-lang-client";
 import {
     ExportOASRequest,
     ExportOASResponse,
@@ -37,6 +37,7 @@ export interface ServiceDesignerAPI {
     updateServiceSourceCode: (params: ServiceSourceCodeRequest) => Promise<UpdatedArtifactsResponse>;
     getServiceModelFromCode: (params: ServiceModelFromCodeRequest) => Promise<ServiceModelFromCodeResponse>;
     getHttpResourceModel: (params: HttpResourceModelRequest) => Promise<HttpResourceModelResponse>;
+    getResourceReturnTypes: (params: ResourceReturnTypesRequest) => Promise<ResourceReturnTypesResponse>;
     addResourceSourceCode: (params: FunctionSourceCodeRequest) => Promise<UpdatedArtifactsResponse>;
     addFunctionSourceCode: (params: FunctionSourceCodeRequest) => Promise<UpdatedArtifactsResponse>;
     updateResourceSourceCode: (params: FunctionSourceCodeRequest) => Promise<UpdatedArtifactsResponse>;

workspaces/ballerina/ballerina-core/src/rpc-types/service-designer/interfaces.ts

@@ -24,73 +24,6 @@ export interface ExportOASRequest {
 export interface ExportOASResponse {
     openSpecFile: string;
 }
-export interface ResponseCode {
-    code: number;
-    title: string;
-    source: string;
-}
-
-export const responseCodes: ResponseCode[] = [
-    { code: 200, title: "200 - OK", source: "http:Ok" },
-    { code: 100, title: "100 - Continue", source: "http:Continue" },
-    { code: 101, title: "101 - Switching Protocols", source: "http:SwitchingProtocols" },
-    { code: 201, title: "201 - Created", source: "http:Created" },
-    { code: 202, title: "202 - Accepted", source: "http:Accepted" },
-    { code: 203, title: "203 - Non-Authoritative Information", source: "http:NonAuthoritativeInformation" },
-    { code: 204, title: "204 - No Content", source: "http:NoContent" },
-    { code: 205, title: "205 - Reset Content", source: "http:ResetContent" },
-    { code: 206, title: "206 - Partial Content", source: "http:PartialContent" },
-    { code: 207, title: "207 - Multi-Status", source: "http:MultiStatus" },
-    { code: 208, title: "208 - Already Reported", source: "http:AlreadyReported" },
-    { code: 226, title: "226 - IM Used", source: "http:IMUsed" },
-    { code: 300, title: "300 - Multiple Choices", source: "http:MultipleChoices" },
-    { code: 301, title: "301 - Moved Permanently", source: "http:MovedPermanently" },
-    { code: 302, title: "302 - Found", source: "http:Found" },
-    { code: 303, title: "303 - See Other", source: "http:SeeOther" },
-    { code: 304, title: "304 - Not Modified", source: "http:NotModified" },
-    { code: 305, title: "305 - Use Proxy", source: "http:UseProxy" },
-    { code: 307, title: "307 - Temporary Redirect", source: "http:TemporaryRedirect" },
-    { code: 308, title: "308 - Permanent Redirect", source: "http:PermanentRedirect" },
-    { code: 400, title: "400 - Bad Request", source: "http:BadRequest" },
-    { code: 401, title: "401 - Unauthorized", source: "http:Unauthorized" },
-    { code: 402, title: "402 - Payment Required", source: "http:PaymentRequired" },
-    { code: 403, title: "403 - Forbidden", source: "http:Forbidden" },
-    { code: 404, title: "404 - Not Found", source: "http:NotFound" },
-    { code: 405, title: "405 - Method Not Allowed", source: "http:MethodNotAllowed" },
-    { code: 406, title: "406 - Not Acceptable", source: "http:NotAcceptable" },
-    { code: 407, title: "407 - Proxy Authentication Required", source: "http:ProxyAuthenticationRequired" },
-    { code: 408, title: "408 - Request Timeout", source: "http:RequestTimeout" },
-    { code: 409, title: "409 - Conflict", source: "http:Conflict" },
-    { code: 410, title: "410 - Gone", source: "http:Gone" },
-    { code: 411, title: "411 - Length Required", source: "http:LengthRequired" },
-    { code: 412, title: "412 - Precondition Failed", source: "http:PreconditionFailed" },
-    { code: 413, title: "413 - Payload Too Large", source: "http:PayloadTooLarge" },
-    { code: 414, title: "414 - URI Too Long", source: "http:UriTooLong" },
-    { code: 415, title: "415 - Unsupported Media Type", source: "http:UnsupportedMediaType" },
-    { code: 416, title: "416 - Range Not Satisfiable", source: "http:RangeNotSatisfiable" },
-    { code: 417, title: "417 - Expectation Failed", source: "http:ExpectationFailed" },
-    { code: 422, title: "422 - Unprocessable Entity", source: "http:UnprocessableEntity" },
-    { code: 423, title: "423 - Locked", source: "http:Locked" },
-    { code: 424, title: "424 - Failed Dependency", source: "http:FailedDependency" },
-    { code: 425, title: "425 - Too Early", source: "http:TooEarly" },
-    { code: 426, title: "426 - Upgrade Required", source: "http:UpgradeRequired" },
-    { code: 428, title: "428 - Precondition Required", source: "http:PreconditionRequired" },
-    { code: 429, title: "429 - Too Many Requests", source: "http:TooManyRequests" },
-    { code: 431, title: "431 - Request Header Fields Too Large", source: "http:RequestHeaderFieldsTooLarge" },
-    { code: 451, title: "451 - Unavailable Due To Legal Reasons", source: "http:UnavailableDueToLegalReasons" },
-    { code: 500, title: "500 - Internal Server Error", source: "http:InternalServerError" },
-    { code: 501, title: "501 - Not Implemented", source: "http:NotImplemented" },
-    { code: 502, title: "502 - Bad Gateway", source: "http:BadGateway" },
-    { code: 503, title: "503 - Service Unavailable", source: "http:ServiceUnavailable" },
-    { code: 504, title: "504 - Gateway Timeout", source: "http:GatewayTimeout" },
-    { code: 505, title: "505 - HTTP Version Not Supported", source: "http:HttpVersionNotSupported" },
-    { code: 506, title: "506 - Variant Also Negotiates", source: "http:VariantAlsoNegotiates" },
-    { code: 507, title: "507 - Insufficient Storage", source: "http:InsufficientStorage" },
-    { code: 508, title: "508 - Loop Detected", source: "http:LoopDetected" },
-    { code: 510, title: "510 - Not Extended", source: "http:NotExtended" },
-    { code: 511, title: "511 - Network Authentication Required", source: "http:NetworkAuthorizationRequired" }
-]
-
 export interface SourceUpdateResponse {
     artifacts: ProjectStructureArtifactResponse[]
 }

workspaces/ballerina/ballerina-core/src/rpc-types/service-designer/rpc-type.ts

@@ -18,7 +18,7 @@
  * THIS FILE INCLUDES AUTO GENERATED CODE
  */
 import { UpdatedArtifactsResponse } from "../../interfaces/bi";
-import { ListenerModelRequest, ListenerModelResponse, ServiceModelRequest, ServiceModelResponse, ServiceModelFromCodeRequest, ServiceModelFromCodeResponse, HttpResourceModelRequest, HttpResourceModelResponse, FunctionSourceCodeRequest, ListenerSourceCodeRequest, ListenersRequest, ListenersResponse, ServiceSourceCodeRequest, ListenerModelFromCodeRequest, ListenerModelFromCodeResponse, TriggerModelsRequest, TriggerModelsResponse, FunctionModelRequest, FunctionModelResponse } from "../../interfaces/extended-lang-client";
+import { ListenerModelRequest, ListenerModelResponse, ServiceModelRequest, ServiceModelResponse, ServiceModelFromCodeRequest, ServiceModelFromCodeResponse, HttpResourceModelRequest, HttpResourceModelResponse, FunctionSourceCodeRequest, ListenerSourceCodeRequest, ListenersRequest, ListenersResponse, ServiceSourceCodeRequest, ListenerModelFromCodeRequest, ListenerModelFromCodeResponse, TriggerModelsRequest, TriggerModelsResponse, FunctionModelRequest, FunctionModelResponse, ResourceReturnTypesRequest, ResourceReturnTypesResponse } from "../../interfaces/extended-lang-client";
 import {
     ExportOASRequest,
     ExportOASResponse,
@@ -39,6 +39,7 @@ export const addServiceSourceCode: RequestType<ServiceSourceCodeRequest, Updated
 export const updateServiceSourceCode: RequestType<ServiceSourceCodeRequest, UpdatedArtifactsResponse> = { method: `${_preFix}/updateServiceSourceCode` };
 export const getServiceModelFromCode: RequestType<ServiceModelFromCodeRequest, ServiceModelFromCodeResponse> = { method: `${_preFix}/getServiceModelFromCode` };
 export const getHttpResourceModel: RequestType<HttpResourceModelRequest, HttpResourceModelResponse> = { method: `${_preFix}/getHttpResourceModel` };
+export const getResourceReturnTypes: RequestType<ResourceReturnTypesRequest, ResourceReturnTypesResponse> = { method: `${_preFix}/getResourceReturnTypes` };
 export const addResourceSourceCode: RequestType<FunctionSourceCodeRequest, UpdatedArtifactsResponse> = { method: `${_preFix}/addResourceSourceCode` };
 export const addFunctionSourceCode: RequestType<FunctionSourceCodeRequest, UpdatedArtifactsResponse> = { method: `${_preFix}/addFunctionSourceCode` };
 export const updateResourceSourceCode: RequestType<FunctionSourceCodeRequest, UpdatedArtifactsResponse> = { method: `${_preFix}/updateResourceSourceCode` };

workspaces/ballerina/ballerina-extension/package.json

@@ -199,6 +199,19 @@
                     "type": "boolean",
                     "default": false,
                     "description": "Use Ballerina distribution language server instead of bundled language server. Note: This will be automatically enabled for Ballerina versions older than 2201.12.3."
+                },
+                "ballerina.enableSequenceDiagramView":{
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Enable the experimental Sequence Diagram View.",
+                    "tags": [
+                        "experimental"
+                    ]
+                },
+                "ballerina.enableAiSuggestions": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Enable AI suggestions in the Flow Diagram View."
                 }
             }
         },

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

@@ -225,6 +225,8 @@ import {
     UpdateConfigVariableResponseV2,
     DeleteConfigVariableRequestV2,
     DeleteConfigVariableResponseV2,
+    ResourceReturnTypesRequest,
+    ResourceReturnTypesResponse,
     JsonToTypeRequest,
     JsonToTypeResponse,
     GetInlineDataMapperCodedataRequest,
@@ -353,6 +355,7 @@ enum EXTENDED_APIS {
     BI_SERVICE_GET_SERVICE_SOURCE = 'serviceDesign/getServiceFromSource',
     BI_SERVICE_UPDATE_SERVICE_CLASS = 'serviceDesign/updateServiceClass',
     BI_SERVICE_GET_RESOURCE = 'serviceDesign/getFunctionModel',
+    BI_SERVICE_GET_RESOURCE_RETURN_TYPES = 'serviceDesign/types',
     BI_SERVICE_ADD_RESOURCE = 'serviceDesign/addResource',
     BI_SERVICE_ADD_FUNCTION = 'serviceDesign/addFunction',
     BI_SERVICE_UPDATE_RESOURCE = 'serviceDesign/updateFunction',
@@ -1049,6 +1052,10 @@ export class ExtendedLangClient extends LanguageClient implements ExtendedLangCl
         return this.sendRequest<HttpResourceModelResponse>(EXTENDED_APIS.BI_SERVICE_GET_RESOURCE, params);
     }
 
+    async getResourceReturnTypes(params: ResourceReturnTypesRequest): Promise<ResourceReturnTypesResponse> {
+        return this.sendRequest<ResourceReturnTypesResponse>(EXTENDED_APIS.BI_SERVICE_GET_RESOURCE_RETURN_TYPES, params);
+    }
+
     async addResourceSourceCode(params: FunctionSourceCodeRequest): Promise<ResourceSourceCodeResponse> {
         return this.sendRequest<ResourceSourceCodeResponse>(EXTENDED_APIS.BI_SERVICE_ADD_RESOURCE, params);
     }

workspaces/ballerina/ballerina-extension/src/rpc-managers/bi-diagram/rpc-manager.ts

@@ -661,12 +661,12 @@ export class BiDiagramRpcManager implements BIDiagramAPI {
     }
 
 
-    // Function to open config toml
+    // Function to open Config.toml
     async openConfigToml(params: OpenConfigTomlRequest): Promise<void> {
         return new Promise(async (resolve) => {
             const currentProject: BallerinaProject | undefined = await getCurrentBIProject(params.filePath);
 
-            const configFilePath = path.join(StateMachine.context().projectUri, "config.toml");
+            const configFilePath = path.join(StateMachine.context().projectUri, "Config.toml");
             const ignoreFile = path.join(StateMachine.context().projectUri, ".gitignore");
             const docLink = "https://ballerina.io/learn/provide-values-to-configurable-variables/#provide-via-toml-syntax";
             const uri = Uri.file(configFilePath);
@@ -694,8 +694,8 @@ export class BiDiagramRpcManager implements BIDiagramAPI {
                 if (fs.existsSync(ignoreFile)) {
                     const ignoreUri = Uri.file(ignoreFile);
                     let ignoreContent: string = fs.readFileSync(ignoreUri.fsPath, 'utf8');
-                    if (!ignoreContent.includes("config.toml")) {
-                        ignoreContent += `\n${"config.toml"}\n`;
+                    if (!ignoreContent.includes("Config.toml")) {
+                        ignoreContent += `\n${"Config.toml"}\n`;
                         fs.writeFile(ignoreUri.fsPath, ignoreContent, function (error) {
                             if (error) {
                                 return window.showErrorMessage('Unable to update the .gitIgnore file: ' + error);

workspaces/ballerina/ballerina-extension/src/rpc-managers/service-designer/rpc-handler.ts

@@ -18,31 +18,33 @@
  * THIS FILE INCLUDES AUTO GENERATED CODE
  */
 import {
-    ExportOASRequest,
-    FunctionModelRequest,
-    FunctionSourceCodeRequest,
-    HttpResourceModelRequest,
-    ListenerModelFromCodeRequest,
-    ListenerModelRequest,
-    ListenerSourceCodeRequest,
-    ListenersRequest,
-    ServiceModelFromCodeRequest,
-    ServiceModelRequest,
-    ServiceSourceCodeRequest,
-    TriggerModelsRequest,
     addFunctionSourceCode,
     addListenerSourceCode,
     addResourceSourceCode,
     addServiceSourceCode,
     exportOASFile,
+    ExportOASRequest,
+    FunctionModelRequest,
+    FunctionSourceCodeRequest,
     getFunctionModel,
     getHttpResourceModel,
     getListenerModel,
     getListenerModelFromCode,
     getListeners,
+    getResourceReturnTypes,
     getServiceModel,
     getServiceModelFromCode,
     getTriggerModels,
+    HttpResourceModelRequest,
+    ListenerModelFromCodeRequest,
+    ListenerModelRequest,
+    ListenerSourceCodeRequest,
+    ListenersRequest,
+    ResourceReturnTypesRequest,
+    ServiceModelFromCodeRequest,
+    ServiceModelRequest,
+    ServiceSourceCodeRequest,
+    TriggerModelsRequest,
     updateListenerSourceCode,
     updateResourceSourceCode,
     updateServiceSourceCode
@@ -65,6 +67,7 @@ export function registerServiceDesignerRpcHandlers(messenger: Messenger) {
     messenger.onRequest(updateServiceSourceCode, (args: ServiceSourceCodeRequest) => rpcManger.updateServiceSourceCode(args));
     messenger.onRequest(getServiceModelFromCode, (args: ServiceModelFromCodeRequest) => rpcManger.getServiceModelFromCode(args));
     messenger.onRequest(getHttpResourceModel, (args: HttpResourceModelRequest) => rpcManger.getHttpResourceModel(args));
+    messenger.onRequest(getResourceReturnTypes, (args: ResourceReturnTypesRequest) => rpcManger.getResourceReturnTypes(args));
     messenger.onRequest(addResourceSourceCode, (args: FunctionSourceCodeRequest) => rpcManger.addResourceSourceCode(args));
     messenger.onRequest(addFunctionSourceCode, (args: FunctionSourceCodeRequest) => rpcManger.addFunctionSourceCode(args));
     messenger.onRequest(updateResourceSourceCode, (args: FunctionSourceCodeRequest) => rpcManger.updateResourceSourceCode(args));