Merge branch 'main' into fixIncompleteSource

Author: sachiniSam

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

@@ -57,9 +57,10 @@ export enum IntermediateClauseType {
     LET = "let",
     WHERE = "where",
     FROM = "from",
-    ORDER_BY = "order by",
+    ORDER_BY = "order-by",
     LIMIT = "limit",
     JOIN = "join",
+    GROUP_BY = "group-by"
 }
 
 export enum ResultClauseType {
@@ -95,6 +96,7 @@ export interface IOType {
     defaultValue?: unknown;
     optional?: boolean;
     isFocused?: boolean;
+    isSeq?: boolean;
     isRecursive?: boolean;
     isDeepNested?: boolean;
     ref?: string;
@@ -141,6 +143,7 @@ export interface DMModel {
     triggerRefresh?: boolean;
     traversingRoot?: string;
     focusInputRootMap?: Record<string, string>;
+    groupById?: string;
 }
 
 export interface ModelState {
@@ -175,6 +178,7 @@ export interface IOTypeField {
     optional?: boolean;
     ref?: string;
     focusExpression?: string;
+    isSeq?: boolean;
     typeInfo?: TypeInfo;
 }
 
@@ -192,7 +196,7 @@ export interface Query {
     output: string,
     inputs: string[];
     diagnostics?: DMDiagnostic[];
-    fromClause: FromClause;
+    fromClause: IntermediateClause;
     intermediateClauses?: IntermediateClause[];
     resultClause: ResultClause;
 }

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

@@ -121,7 +121,7 @@ export interface ProjectImports {
 // Data-mapper related interfaces
 export interface MetadataWithAttachments {
     metadata: ExtendedDataMapperMetadata;
-    attachments?: Attachment[];
+    attachments: Attachment[];
 }
 
 export interface InlineMappingsSourceResult {

workspaces/ballerina/ballerina-extension/src/features/ai/dataMapping.ts

@@ -29,10 +29,11 @@ import { DefaultableParam, FunctionDefinition, IncludedRecordParam, ModulePart,
 import { addMissingRequiredFields, attemptRepairProject, checkProjectDiagnostics } from "../../../src/rpc-managers/ai-panel/repair-utils";
 import { NullablePrimitiveType, PrimitiveArrayType, PrimitiveType } from "./constants";
 import { INVALID_RECORD_REFERENCE } from "../../../src/views/ai-panel/errorCodes";
-import { PackageInfo, TypesGenerationResult } from "./service/datamapper/types";
+import { CodeRepairResult, PackageInfo, TypesGenerationResult } from "./service/datamapper/types";
 import { URI } from "vscode-uri";
 import { getAllDataMapperSource } from "./service/datamapper/datamapper";
 import { StateMachine } from "../../stateMachine";
+import { CopilotEventHandler } from "./service/event";
 
 // Set to false to include mappings with default values
 const OMIT_DEFAULT_MAPPINGS_ENABLED = true;
@@ -473,13 +474,15 @@ export async function createTempFileAndGenerateMetadata(params: CreateTempFileRe
 
 export async function generateMappings(
   metadataWithAttachments: MetadataWithAttachments,
-  context: any
+  context: any,
+  eventHandler: CopilotEventHandler
 ): Promise<AllDataMapperSourceRequest> {
   const targetFilePath = metadataWithAttachments.metadata.codeData.lineRange.fileName || context.documentUri;
 
   const generatedMappings = await generateMappingExpressionsFromModel(
     metadataWithAttachments.metadata.mappingsModel as DMModel,
-    metadataWithAttachments.attachments || []
+    metadataWithAttachments.attachments || [],
+    eventHandler
   );
 
   const customFunctionMappings = generatedMappings.filter(mapping => mapping.isFunctionCall);
@@ -1060,6 +1063,7 @@ export async function generateInlineMappingsSource(
   inlineMappingRequest: MetadataWithAttachments,
   langClient: ExtendedLangClient,
   context: any,
+  eventHandler: CopilotEventHandler
 ): Promise<InlineMappingsSourceResult> {
   if (!inlineMappingRequest) {
     throw new Error("Inline mapping request is required");
@@ -1096,16 +1100,18 @@ export async function generateInlineMappingsSource(
 
   // Prepare mapping request payload
   const mappingRequestPayload: MetadataWithAttachments = {
-    metadata: tempFileMetadata
+    metadata: tempFileMetadata,
+    attachments: []
   };
-  if (inlineMappingRequest.attachments && inlineMappingRequest.attachments.length > 0) {
+  if (inlineMappingRequest.attachments.length > 0) {
     mappingRequestPayload.attachments = inlineMappingRequest.attachments;
   }
 
   // Generate mappings and source code
   const allMappingsRequest = await generateMappings(
     mappingRequestPayload,
-    context
+    context,
+    eventHandler
   );
 
   const generatedSourceResponse = await getAllDataMapperSource(allMappingsRequest);
@@ -1315,7 +1321,7 @@ export async function repairCodeAndGetUpdatedContent(
   params: RepairCodeParams,
   langClient: ExtendedLangClient,
   projectRoot: string
-): Promise<{ finalContent: string; customFunctionsContent: string }> {
+): Promise<CodeRepairResult> {
 
   // Read main file content
   let finalContent = fs.readFileSync(params.tempFileMetadata.codeData.lineRange.fileName, 'utf8');