@fc-components/monaco-editor 0.2.1 → 0.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/expr/__tests__/__mocks__/monaco-editor.d.ts +28 -0
- package/dist/expr/completion/getCompletionProvider.d.ts +4 -0
- package/dist/expr/expr.d.ts +83 -0
- package/dist/expr/index.d.ts +3 -0
- package/dist/expr/parser/index.d.ts +3 -0
- package/dist/expr/parser/lexer.d.ts +27 -0
- package/dist/expr/parser/parser.d.ts +66 -0
- package/dist/expr/parser/types.d.ts +32 -0
- package/dist/expr/types.d.ts +17 -0
- package/dist/expr/validation.d.ts +12 -0
- package/dist/index.d.ts +2 -0
- package/dist/monaco-editor.cjs.development.js +1921 -0
- package/dist/monaco-editor.cjs.development.js.map +1 -1
- package/dist/monaco-editor.cjs.production.min.js +1 -1
- package/dist/monaco-editor.cjs.production.min.js.map +1 -1
- package/dist/monaco-editor.esm.js +1924 -4
- package/dist/monaco-editor.esm.js.map +1 -1
- package/package.json +5 -1
- package/src/expr/__tests__/__mocks__/monaco-editor.ts +34 -0
- package/src/expr/__tests__/expr.test.tsx +339 -0
- package/src/expr/completion/getCompletionProvider.ts +133 -0
- package/src/expr/expr.ts +229 -0
- package/src/expr/index.tsx +322 -0
- package/src/expr/parser/index.ts +3 -0
- package/src/expr/parser/lexer.ts +377 -0
- package/src/expr/parser/parser.ts +581 -0
- package/src/expr/parser/types.ts +77 -0
- package/src/expr/types.ts +17 -0
- package/src/expr/validation.ts +209 -0
- package/src/index.tsx +2 -0
|
@@ -0,0 +1,209 @@
|
|
|
1
|
+
import * as monaco from 'monaco-editor';
|
|
2
|
+
import { ExprParser } from './parser';
|
|
3
|
+
|
|
4
|
+
const EXPR_LANG_ID = 'expr';
|
|
5
|
+
|
|
6
|
+
const parser = new ExprParser();
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Validate an expr-lang expression and return Monaco editor markers.
|
|
10
|
+
* Uses the recursive descent parser for syntax errors,
|
|
11
|
+
* plus regex-based checks for structural issues like unbalanced quotes/brackets.
|
|
12
|
+
*/
|
|
13
|
+
export const validateExpr = (expr: string): Omit<monaco.editor.IMarker, 'owner' | 'resource'>[] => {
|
|
14
|
+
const markers: Omit<monaco.editor.IMarker, 'owner' | 'resource'>[] = [];
|
|
15
|
+
|
|
16
|
+
if (!expr || expr.trim().length === 0) {
|
|
17
|
+
return markers;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
// 1. Parser-based syntax validation
|
|
21
|
+
const parseErrors = parser.parse(expr);
|
|
22
|
+
for (const err of parseErrors) {
|
|
23
|
+
markers.push({
|
|
24
|
+
severity: monaco.MarkerSeverity.Error,
|
|
25
|
+
startLineNumber: err.startLine,
|
|
26
|
+
startColumn: err.startColumn,
|
|
27
|
+
endLineNumber: err.endLine,
|
|
28
|
+
endColumn: err.endColumn,
|
|
29
|
+
message: err.message,
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
// 2. Line-level structural checks (fallback for issues the parser might miss)
|
|
34
|
+
const structuralMarkers = validateLineLevel(expr);
|
|
35
|
+
markers.push(...structuralMarkers);
|
|
36
|
+
|
|
37
|
+
return markers;
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* Basic line-level validation for quotes and bracket balancing.
|
|
42
|
+
*/
|
|
43
|
+
function validateLineLevel(expr: string): Omit<monaco.editor.IMarker, 'owner' | 'resource'>[] {
|
|
44
|
+
const markers: Omit<monaco.editor.IMarker, 'owner' | 'resource'>[] = [];
|
|
45
|
+
const lines = expr.split('\n');
|
|
46
|
+
let inBlockComment = false;
|
|
47
|
+
|
|
48
|
+
lines.forEach((line, index) => {
|
|
49
|
+
const lineNumber = index + 1;
|
|
50
|
+
|
|
51
|
+
// Track block comment state
|
|
52
|
+
if (!inBlockComment) {
|
|
53
|
+
const blockCommentStart = line.indexOf('/*');
|
|
54
|
+
if (blockCommentStart !== -1) {
|
|
55
|
+
const blockCommentEnd = line.indexOf('*/', blockCommentStart + 2);
|
|
56
|
+
if (blockCommentEnd === -1) {
|
|
57
|
+
inBlockComment = true;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
} else {
|
|
61
|
+
const blockCommentEnd = line.indexOf('*/');
|
|
62
|
+
if (blockCommentEnd !== -1) {
|
|
63
|
+
inBlockComment = false;
|
|
64
|
+
}
|
|
65
|
+
if (inBlockComment || line.trim().startsWith('/*')) {
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
const trimmedLine = line.trim();
|
|
71
|
+
if (trimmedLine.startsWith('//') || trimmedLine.startsWith('/*')) {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
// Check for unclosed quotes
|
|
76
|
+
const singleQuotes = countQuotesOutsideBlockComments(line);
|
|
77
|
+
if (singleQuotes % 2 !== 0) {
|
|
78
|
+
markers.push({
|
|
79
|
+
severity: monaco.MarkerSeverity.Warning,
|
|
80
|
+
startLineNumber: lineNumber,
|
|
81
|
+
startColumn: 1,
|
|
82
|
+
endLineNumber: lineNumber,
|
|
83
|
+
endColumn: line.length + 1,
|
|
84
|
+
message: "Unclosed single quote '",
|
|
85
|
+
source: EXPR_LANG_ID,
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
const doubleQuotes = countDoubleQuotesOutsideBlockComments(line);
|
|
90
|
+
if (doubleQuotes % 2 !== 0) {
|
|
91
|
+
markers.push({
|
|
92
|
+
severity: monaco.MarkerSeverity.Warning,
|
|
93
|
+
startLineNumber: lineNumber,
|
|
94
|
+
startColumn: 1,
|
|
95
|
+
endLineNumber: lineNumber,
|
|
96
|
+
endColumn: line.length + 1,
|
|
97
|
+
message: 'Unclosed double quote "',
|
|
98
|
+
source: EXPR_LANG_ID,
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
const backticks = (line.match(/`/g) || []).length;
|
|
103
|
+
if (backticks % 2 !== 0) {
|
|
104
|
+
markers.push({
|
|
105
|
+
severity: monaco.MarkerSeverity.Warning,
|
|
106
|
+
startLineNumber: lineNumber,
|
|
107
|
+
startColumn: 1,
|
|
108
|
+
endLineNumber: lineNumber,
|
|
109
|
+
endColumn: line.length + 1,
|
|
110
|
+
message: 'Unclosed backtick `',
|
|
111
|
+
source: EXPR_LANG_ID,
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
// Check for unbalanced brackets
|
|
116
|
+
const openParens = (line.match(/\(/g) || []).length;
|
|
117
|
+
const closeParens = (line.match(/\)/g) || []).length;
|
|
118
|
+
if (openParens > closeParens) {
|
|
119
|
+
markers.push({
|
|
120
|
+
severity: monaco.MarkerSeverity.Warning,
|
|
121
|
+
startLineNumber: lineNumber,
|
|
122
|
+
startColumn: 1,
|
|
123
|
+
endLineNumber: lineNumber,
|
|
124
|
+
endColumn: line.length + 1,
|
|
125
|
+
message: 'Unmatched opening parenthesis',
|
|
126
|
+
source: EXPR_LANG_ID,
|
|
127
|
+
});
|
|
128
|
+
} else if (closeParens > openParens) {
|
|
129
|
+
markers.push({
|
|
130
|
+
severity: monaco.MarkerSeverity.Warning,
|
|
131
|
+
startLineNumber: lineNumber,
|
|
132
|
+
startColumn: 1,
|
|
133
|
+
endLineNumber: lineNumber,
|
|
134
|
+
endColumn: line.length + 1,
|
|
135
|
+
message: 'Unmatched closing parenthesis',
|
|
136
|
+
source: EXPR_LANG_ID,
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
const openBrackets = (line.match(/\[/g) || []).length;
|
|
141
|
+
const closeBrackets = (line.match(/\]/g) || []).length;
|
|
142
|
+
if (openBrackets > closeBrackets) {
|
|
143
|
+
markers.push({
|
|
144
|
+
severity: monaco.MarkerSeverity.Warning,
|
|
145
|
+
startLineNumber: lineNumber,
|
|
146
|
+
startColumn: 1,
|
|
147
|
+
endLineNumber: lineNumber,
|
|
148
|
+
endColumn: line.length + 1,
|
|
149
|
+
message: 'Unmatched opening bracket',
|
|
150
|
+
source: EXPR_LANG_ID,
|
|
151
|
+
});
|
|
152
|
+
} else if (closeBrackets > openBrackets) {
|
|
153
|
+
markers.push({
|
|
154
|
+
severity: monaco.MarkerSeverity.Warning,
|
|
155
|
+
startLineNumber: lineNumber,
|
|
156
|
+
startColumn: 1,
|
|
157
|
+
endLineNumber: lineNumber,
|
|
158
|
+
endColumn: line.length + 1,
|
|
159
|
+
message: 'Unmatched closing bracket',
|
|
160
|
+
source: EXPR_LANG_ID,
|
|
161
|
+
});
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
const openBraces = (line.match(/\{/g) || []).length;
|
|
165
|
+
const closeBraces = (line.match(/\}/g) || []).length;
|
|
166
|
+
if (openBraces > closeBraces) {
|
|
167
|
+
markers.push({
|
|
168
|
+
severity: monaco.MarkerSeverity.Warning,
|
|
169
|
+
startLineNumber: lineNumber,
|
|
170
|
+
startColumn: 1,
|
|
171
|
+
endLineNumber: lineNumber,
|
|
172
|
+
endColumn: line.length + 1,
|
|
173
|
+
message: 'Unmatched opening curly brace',
|
|
174
|
+
source: EXPR_LANG_ID,
|
|
175
|
+
});
|
|
176
|
+
} else if (closeBraces > openBraces) {
|
|
177
|
+
markers.push({
|
|
178
|
+
severity: monaco.MarkerSeverity.Warning,
|
|
179
|
+
startLineNumber: lineNumber,
|
|
180
|
+
startColumn: 1,
|
|
181
|
+
endLineNumber: lineNumber,
|
|
182
|
+
endColumn: line.length + 1,
|
|
183
|
+
message: 'Unmatched closing curly brace',
|
|
184
|
+
source: EXPR_LANG_ID,
|
|
185
|
+
});
|
|
186
|
+
}
|
|
187
|
+
});
|
|
188
|
+
|
|
189
|
+
return markers;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
function countQuotesOutsideBlockComments(line: string): number {
|
|
193
|
+
const withoutBlockComments = line.replace(/\/\*[\s\S]*?\*\//g, '');
|
|
194
|
+
return (withoutBlockComments.match(/'/g) || []).length;
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
function countDoubleQuotesOutsideBlockComments(line: string): number {
|
|
198
|
+
const withoutBlockComments = line.replace(/\/\*[\s\S]*?\*\//g, '');
|
|
199
|
+
return (withoutBlockComments.match(/"/g) || []).length;
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
/**
|
|
203
|
+
* Validate an expr-lang expression and return a plain array of human-readable error messages.
|
|
204
|
+
* Returns an empty array if the expression is valid.
|
|
205
|
+
*/
|
|
206
|
+
export function checkExpr(expr: string): string[] {
|
|
207
|
+
const errors = parser.parse(expr);
|
|
208
|
+
return errors.map((e) => `${e.startLine}:${e.startColumn}: ${e.message}`);
|
|
209
|
+
}
|
package/src/index.tsx
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import promql from './promql';
|
|
2
2
|
import yaml from './yaml';
|
|
3
3
|
import sql from './sql';
|
|
4
|
+
import expr from './expr';
|
|
4
5
|
|
|
5
6
|
export { promql as PromQLMonacoEditor };
|
|
6
7
|
export { yaml as YamlMonacoEditor };
|
|
7
8
|
export { sql as SqlMonacoEditor };
|
|
9
|
+
export { expr as ExprMonacoEditor };
|