Skip to content

Commit 9571318

Browse files
authored
Merge branch 'main' into fix-expression-overflow-record-config
2 parents aeef245 + 0248276 commit 9571318

File tree

77 files changed

+3190
-1602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+3190
-1602
lines changed

.github/CODEOWNERS

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@
22
*.css @hevayo @gigara @tharindulak
33
*.scss @hevayo @gigara @tharindulak
44
.trivyignore @hevayo @gigara
5+
/.github/ @hevayo @gigara @kanushka
6+
**/package.json @hevayo @gigara @kanushka
7+
**/package-lock.json @hevayo @gigara @kanushka
8+
**/pnpm-lock.yaml @hevayo @gigara @kanushka
9+
pnpm-workspace.yaml @hevayo @gigara @kanushka
10+
rush.json @hevayo @gigara @kanushka
11+
/common/ @hevayo @gigara @kanushka
512
/workspaces/common-libs/ @hevayo @gigara @tharindulak
613
/workspaces/mi/ @hevayo @gigara @kaumini
714
/workspaces/ballerina/ballerina-core/src/interfaces/extended-lang-client.ts @hevayo @axewilledge @kanushka
815
/workspaces/ballerina/ballerina-rpc-client @hevayo @axewilledge @kanushka
916
/workspaces/choreo/ @kaje94
1017
/workspaces/wso2-platform/ @kaje94
11-
* @hevayo @gigara
18+
* @hevayo @gigara

.trivyignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
# Trivy ignore file for known low-risk vulnerabilities
22
# Format: CVE-ID or vulnerability ID
33

4-
# Low severity vulnerability in jsondiffpatch package
5-
# Used as transitive dependency via 'ai' package
6-
# Risk Assessment: LOW severity, limited impact on diff operations
7-
# Decision: Acceptable risk - waiting for ai package to update jsondiffpatch dependency
8-
# Related Issue: https://github.com/wso2/product-ballerina-integrator/issues/1274
9-
CVE-2025-9910
10-
114
# No fix released by the author
125
# https://github.com/wso2/vscode-extensions/issues/550
136
CVE-2020-36851

common/config/rush/pnpm-lock.yaml

Lines changed: 1186 additions & 1154 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ export enum IntermediateClauseType {
5757
LET = "let",
5858
WHERE = "where",
5959
FROM = "from",
60-
ORDER_BY = "order by",
60+
ORDER_BY = "order-by",
6161
LIMIT = "limit",
6262
JOIN = "join",
63+
GROUP_BY = "group-by"
6364
}
6465

6566
export enum ResultClauseType {
@@ -95,6 +96,7 @@ export interface IOType {
9596
defaultValue?: unknown;
9697
optional?: boolean;
9798
isFocused?: boolean;
99+
isSeq?: boolean;
98100
isRecursive?: boolean;
99101
isDeepNested?: boolean;
100102
ref?: string;
@@ -141,6 +143,7 @@ export interface DMModel {
141143
triggerRefresh?: boolean;
142144
traversingRoot?: string;
143145
focusInputRootMap?: Record<string, string>;
146+
groupById?: string;
144147
}
145148

146149
export interface ModelState {
@@ -175,6 +178,7 @@ export interface IOTypeField {
175178
optional?: boolean;
176179
ref?: string;
177180
focusExpression?: string;
181+
isSeq?: boolean;
178182
typeInfo?: TypeInfo;
179183
}
180184

@@ -192,7 +196,7 @@ export interface Query {
192196
output: string,
193197
inputs: string[];
194198
diagnostics?: DMDiagnostic[];
195-
fromClause: FromClause;
199+
fromClause: IntermediateClause;
196200
intermediateClauses?: IntermediateClause[];
197201
resultClause: ResultClause;
198202
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export interface ProjectImports {
121121
// Data-mapper related interfaces
122122
export interface MetadataWithAttachments {
123123
metadata: ExtendedDataMapperMetadata;
124-
attachments?: Attachment[];
124+
attachments: Attachment[];
125125
}
126126

127127
export interface InlineMappingsSourceResult {

workspaces/ballerina/ballerina-core/src/rpc-types/common/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ import {
3232
FileOrDirRequest,
3333
WorkspaceRootResponse,
3434
ShowErrorMessageRequest,
35-
WorkspaceTypeResponse
35+
WorkspaceTypeResponse,
36+
SampleDownloadRequest
3637
} from "./interfaces";
3738

3839
export interface CommonRPCAPI {
@@ -51,4 +52,5 @@ export interface CommonRPCAPI {
5152
showErrorMessage: (params: ShowErrorMessageRequest) => void;
5253
getCurrentProjectTomlValues: () => Promise<Record<string, any>>;
5354
getWorkspaceType: () => Promise<WorkspaceTypeResponse>;
55+
downloadSelectedSampleFromGithub: (params: SampleDownloadRequest) => Promise<boolean>;
5456
}

workspaces/ballerina/ballerina-core/src/rpc-types/common/interfaces.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,7 @@ export interface PackageTomlValues {
113113
export interface WorkspaceTypeResponse {
114114
type: "SINGLE_PROJECT" | "MULTIPLE_PROJECTS" | "BALLERINA_WORKSPACE" | "VSCODE_WORKSPACE" | "UNKNOWN"
115115
}
116+
117+
export interface SampleDownloadRequest {
118+
zipFileName: string;
119+
}

workspaces/ballerina/ballerina-core/src/rpc-types/common/rpc-type.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ import {
3333
FileOrDirRequest,
3434
WorkspaceRootResponse,
3535
ShowErrorMessageRequest,
36-
WorkspaceTypeResponse
36+
WorkspaceTypeResponse,
37+
SampleDownloadRequest
3738
} from "./interfaces";
3839
import { RequestType, NotificationType } from "vscode-messenger-common";
3940

@@ -53,3 +54,4 @@ export const getWorkspaceRoot: RequestType<void, WorkspaceRootResponse> = { meth
5354
export const showErrorMessage: NotificationType<ShowErrorMessageRequest> = { method: `${_preFix}/showErrorMessage` };
5455
export const getCurrentProjectTomlValues: RequestType<void, void> = { method: `${_preFix}/getCurrentProjectTomlValues` };
5556
export const getWorkspaceType: RequestType<void, WorkspaceTypeResponse> = { method: `${_preFix}/getWorkspaceType` };
57+
export const downloadSelectedSampleFromGithub: RequestType<SampleDownloadRequest, boolean> = { method: `${_preFix}/downloadSelectedSampleFromGithub` };

workspaces/ballerina/ballerina-core/src/state-machine-types.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ export enum MACHINE_VIEW {
9999
AIAgentDesigner = "AI Agent Designer",
100100
AIChatAgentWizard = "AI Chat Agent Wizard",
101101
ResolveMissingDependencies = "Resolve Missing Dependencies",
102-
ServiceFunctionForm = "Service Function Form"
102+
ServiceFunctionForm = "Service Function Form",
103+
BISamplesView = "BI Samples View"
103104
}
104105

105106
export interface MachineEvent {

workspaces/ballerina/ballerina-extension/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,6 +1214,7 @@
12141214
"portfinder": "^1.0.32",
12151215
"source-map-support": "^0.5.21",
12161216
"toml": "^3.0.0",
1217+
"unzipper": "~0.12.3",
12171218
"uuid": "^11.1.0",
12181219
"vscode-debugadapter": "^1.51.0",
12191220
"vscode-debugprotocol": "^1.51.0",

0 commit comments

Comments
 (0)