Merge pull request #1031 from wso2/ballerina-integrator-1.5.3

Merge "ballerina-integrator-1.5.3" into "release-ballerina"

Author: kanushka

.github/CODEOWNERS

@@ -2,10 +2,17 @@
 *.css @hevayo @gigara @tharindulak
 *.scss @hevayo @gigara @tharindulak
 .trivyignore @hevayo @gigara
+/.github/ @hevayo @gigara @kanushka
+**/package.json @hevayo @gigara @kanushka
+**/package-lock.json @hevayo @gigara @kanushka
+**/pnpm-lock.yaml @hevayo @gigara @kanushka
+pnpm-workspace.yaml @hevayo @gigara @kanushka
+rush.json @hevayo @gigara @kanushka
+/common/ @hevayo @gigara @kanushka
 /workspaces/common-libs/ @hevayo @gigara @tharindulak
 /workspaces/mi/ @hevayo @gigara @kaumini
 /workspaces/ballerina/ballerina-core/src/interfaces/extended-lang-client.ts @hevayo @axewilledge @kanushka
 /workspaces/ballerina/ballerina-rpc-client @hevayo @axewilledge @kanushka
 /workspaces/choreo/ @kaje94
 /workspaces/wso2-platform/ @kaje94
-* @hevayo @gigara
+* @hevayo @gigara

.trivyignore

@@ -1,13 +1,6 @@
 # Trivy ignore file for known low-risk vulnerabilities
 # Format: CVE-ID or vulnerability ID
 
-# Low severity vulnerability in jsondiffpatch package
-# Used as transitive dependency via 'ai' package
-# Risk Assessment: LOW severity, limited impact on diff operations
-# Decision: Acceptable risk - waiting for ai package to update jsondiffpatch dependency
-# Related Issue: https://github.com/wso2/product-ballerina-integrator/issues/1274
-CVE-2025-9910
-
 # No fix released by the author
 # https://github.com/wso2/vscode-extensions/issues/550
 CVE-2020-36851

.vscode/launch.json

@@ -245,7 +245,8 @@
                 "--extensionTestsPath=${workspaceFolder}/workspaces/ballerina/ballerina-extension/out/test",
                 "${workspaceFolder}/workspaces/ballerina/ballerina-extension/test/data/bi_empty_project",
                 "${workspaceFolder}/workspaces/ballerina/ballerina-extension/test/data/bi_init",
-                "${workspaceFolder}/workspaces/ballerina/ballerina-extension/test/data/simple_order_management_system","${workspaceFolder}/workspaces/ballerina/ballerina-extension/test/data/ai_datamapper"
+                "${workspaceFolder}/workspaces/ballerina/ballerina-extension/test/data/simple_order_management_system",
+                "${workspaceFolder}/workspaces/ballerina/ballerina-extension/test/data/ai_datamapper"
             ],
             "env": {
                 "LS_EXTENSIONS_PATH": "",
@@ -294,4 +295,4 @@
             "preLaunchTask": "npm: watch-apk"
         },
     ]
-}
+}

common/config/rush/pnpm-lock.yaml

@@ -83,7 +83,7 @@
     "clean": "rimraf ./dist",
     "compile": "tsc -p .",
     "watch": "tsc -p . -w",
-    "package": "if [ $isPreRelease = true ]; then vsce package --no-dependencies --pre-release; else vsce package --no-dependencies; fi",
+    "package": "node ../../common-libs/scripts/package-vsix.js",
     "build": "pnpm clean && pnpm run copyFonts && webpack --mode production --devtool hidden-source-map && pnpm run package && pnpm run postbuild",
     "compile-tests": "pnpm run compile",
     "watch-tests": "pnpm run watch",

workspaces/api-designer/api-designer-extension/package.json

@@ -51,7 +51,7 @@
       "pretest": "npm run compile && npm run lint",
       "lint": "eslint src --ext ts",
       "test": "node ./out/test/runTest.js",
-      "build": "if [ $isPreRelease = true ]; then vsce package --no-dependencies --pre-release; else vsce package --no-dependencies; fi && pnpm run postbuild",
+      "build": "node ../../common-libs/scripts/package-vsix.js && pnpm run postbuild",
       "postbuild": "pnpm run copyVSIX",
       "copyVSIX": "copyfiles *.vsix ./vsix",
       "copyVSIXToRoot": "copyfiles -f ./vsix/* ../../.."

workspaces/apk/apk-extension/package.json

@@ -32,7 +32,6 @@ export const BI_COMMANDS = {
     BI_RUN_PROJECT: 'BI.project.run',
     BI_DEBUG_PROJECT: 'BI.project.debug',
     REFRESH_COMMAND: 'BI.project-explorer.refresh',
-    FOCUS_PROJECT_EXPLORER: 'BI.project-explorer.focus',
     PROJECT_EXPLORER: 'BI.project-explorer',
     ADD_CONNECTIONS: 'BI.project-explorer.add-connection',
     ADD_CUSTOM_CONNECTOR: 'BI.project-explorer.add-custom-connector',
@@ -52,6 +51,8 @@ export const BI_COMMANDS = {
     BI_EDIT_TEST_FUNCTION_DEF: 'BI.test.edit.function.def',
     ADD_NATURAL_FUNCTION: 'BI.project-explorer.add-natural-function',
     TOGGLE_TRACE_LOGS: 'BI.toggle.trace.logs',
+    CREATE_BI_PROJECT: 'BI.project.createBIProjectPure',
+    CREATE_BI_MIGRATION_PROJECT: 'BI.project.createBIProjectMigration',
     ADD_INTEGRATION: 'BI.project-explorer.add-integration',
     NOTIFY_PROJECT_EXPLORER: 'BI.project-explorer.notify',
 };

workspaces/ballerina/ballerina-core/src/interfaces/constants.ts

@@ -57,8 +57,10 @@ export enum IntermediateClauseType {
     LET = "let",
     WHERE = "where",
     FROM = "from",
-    ORDER_BY = "order by",
-    LIMIT = "limit"
+    ORDER_BY = "order-by",
+    LIMIT = "limit",
+    JOIN = "join",
+    GROUP_BY = "group-by"
 }
 
 export enum ResultClauseType {
@@ -93,8 +95,8 @@ export interface IOType {
     members?: IOType[];
     defaultValue?: unknown;
     optional?: boolean;
-    focusedMemberId?: string;
     isFocused?: boolean;
+    isSeq?: boolean;
     isRecursive?: boolean;
     isDeepNested?: boolean;
     ref?: string;
@@ -125,6 +127,7 @@ export interface ExpandedDMModel {
     query?: Query;
     mapping_fields?: Record<string, any>;
     triggerRefresh?: boolean;
+    focusInputRootMap?: Record<string, string>;
 }
 
 export interface DMModel {
@@ -138,6 +141,9 @@ export interface DMModel {
     focusInputs?: Record<string, IOTypeField>;
     mapping_fields?: Record<string, any>;
     triggerRefresh?: boolean;
+    traversingRoot?: string;
+    focusInputRootMap?: Record<string, string>;
+    groupById?: string;
 }
 
 export interface ModelState {
@@ -172,6 +178,7 @@ export interface IOTypeField {
     optional?: boolean;
     ref?: string;
     focusExpression?: string;
+    isSeq?: boolean;
     typeInfo?: TypeInfo;
 }
 
@@ -189,7 +196,7 @@ export interface Query {
     output: string,
     inputs: string[];
     diagnostics?: DMDiagnostic[];
-    fromClause: FromClause;
+    fromClause: IntermediateClause;
     intermediateClauses?: IntermediateClause[];
     resultClause: ResultClause;
 }
@@ -205,6 +212,9 @@ export interface IntermediateClauseProps {
     type?: string;
     expression: string;
     order?: "ascending" | "descending";
+    lhsExpression?: string;
+    rhsExpression?: string;
+    isOuter?: boolean;
 }
 
 export interface IntermediateClause {

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

@@ -474,15 +474,28 @@ export interface GetDataMapperCodedataResponse {
 export interface PropertyRequest {
     filePath: string;
     codedata: CodeData;
-    propertyKey: string,
     targetField: string;
+}
+
+export interface FieldPropertyRequest extends PropertyRequest {
     fieldId: string;
 }
 
 export interface PropertyResponse {
     property: Property;
 }
 
+export interface ClausePositionRequest {
+    filePath: string;
+    codedata: CodeData;
+    targetField: string;
+    index: number;
+}
+
+export interface ClausePositionResponse {
+    position: LinePosition;
+}
+
 export interface GraphqlDesignServiceParams {
     filePath: string;
     startLine: LinePosition;

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

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