@puca/puca-core 12.13.11 → 12.13.13
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/core/services/llm/llm.service.d.ts +2 -0
- package/dist/core/services/llm/llm.service.js +76 -48
- package/dist/core/services/llm/llm.service.js.map +1 -1
- package/dist/core/services/llm/token-budget.service.js +8 -8
- package/dist/core/services/llm/token-budget.service.js.map +1 -1
- package/dist/core/services/mcp/mcp-server.service.d.ts +1 -0
- package/dist/core/services/mcp/mcp-server.service.js +2 -2
- package/dist/core/services/mcp/mcp-server.service.js.map +1 -1
- package/dist/core/services/mq/mq.service.d.ts +1 -9
- package/dist/core/services/mq/mq.service.js +99 -20
- package/dist/core/services/mq/mq.service.js.map +1 -1
- package/dist/packages/crm/crm.service.js +3 -1
- package/dist/packages/crm/crm.service.js.map +1 -1
- package/dist/plugins/final-user-query-language/final-user-query-language.js +5 -5
- package/dist/plugins/final-user-query-language/final-user-query-language.js.map +1 -1
- package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.d.ts +3 -0
- package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.js +13 -6
- package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/fuql-grammar.js +113 -6
- package/fuql-grammar.ne +113 -6
- package/package.json +1 -1
package/fuql-grammar.js
CHANGED
|
@@ -6,6 +6,10 @@ var grammar = {
|
|
|
6
6
|
Lexer: undefined,
|
|
7
7
|
ParserRules: [
|
|
8
8
|
{"name": "main", "symbols": ["ONDE"], "postprocess": d => {
|
|
9
|
+
if(!d[0]) {
|
|
10
|
+
//console.log('MAIN_ONDE')
|
|
11
|
+
return null
|
|
12
|
+
}
|
|
9
13
|
return {
|
|
10
14
|
mode: 'ONDE',
|
|
11
15
|
...d[0]
|
|
@@ -13,6 +17,10 @@ var grammar = {
|
|
|
13
17
|
}
|
|
14
18
|
},
|
|
15
19
|
{"name": "main", "symbols": ["query", "_", "ONDE"], "postprocess": d => {
|
|
20
|
+
if(!d[2]) {
|
|
21
|
+
//console.log('MAIN query _ ONDE')
|
|
22
|
+
return null
|
|
23
|
+
}
|
|
16
24
|
return {
|
|
17
25
|
mode: 'query _ ONDE',
|
|
18
26
|
...d[0],
|
|
@@ -33,6 +41,10 @@ var grammar = {
|
|
|
33
41
|
},
|
|
34
42
|
{"name": "ONDE$string$1", "symbols": [{"literal":"O"}, {"literal":"N"}, {"literal":"D"}, {"literal":"E"}], "postprocess": function joiner(d) {return d.join('');}},
|
|
35
43
|
{"name": "ONDE", "symbols": ["ONDE$string$1", "_", "expr"], "postprocess": d => {
|
|
44
|
+
if(!d[2]) {
|
|
45
|
+
//console.log('ONDE')
|
|
46
|
+
return null
|
|
47
|
+
}
|
|
36
48
|
return {
|
|
37
49
|
where: d[2]
|
|
38
50
|
}
|
|
@@ -69,6 +81,16 @@ var grammar = {
|
|
|
69
81
|
['TERMINA COM']: 'endsWith'
|
|
70
82
|
}[d[2].join('')]
|
|
71
83
|
|
|
84
|
+
if(!d[0][0]) {
|
|
85
|
+
//console.log('OP1')
|
|
86
|
+
return null
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
if(!d[4][0]) {
|
|
90
|
+
//console.log('OP2')
|
|
91
|
+
return null
|
|
92
|
+
}
|
|
93
|
+
|
|
72
94
|
return {
|
|
73
95
|
v1: d[0][0],
|
|
74
96
|
v2: d[4][0],
|
|
@@ -77,6 +99,10 @@ var grammar = {
|
|
|
77
99
|
}
|
|
78
100
|
},
|
|
79
101
|
{"name": "expr", "symbols": ["expr", "_", {"literal":"E"}, "_", "expr"], "postprocess": d => {
|
|
102
|
+
if(!d[0] || !d[4]) {
|
|
103
|
+
//console.log("E")
|
|
104
|
+
return null
|
|
105
|
+
}
|
|
80
106
|
return {
|
|
81
107
|
and: [
|
|
82
108
|
d[0],
|
|
@@ -87,6 +113,10 @@ var grammar = {
|
|
|
87
113
|
},
|
|
88
114
|
{"name": "expr$string$1", "symbols": [{"literal":"O"}, {"literal":"U"}], "postprocess": function joiner(d) {return d.join('');}},
|
|
89
115
|
{"name": "expr", "symbols": ["expr", "_", "expr$string$1", "_", "expr"], "postprocess": d => {
|
|
116
|
+
if(!d[0] || !d[4]) {
|
|
117
|
+
//console.log('OU')
|
|
118
|
+
return null
|
|
119
|
+
}
|
|
90
120
|
return {
|
|
91
121
|
or: [
|
|
92
122
|
d[0],
|
|
@@ -97,6 +127,11 @@ var grammar = {
|
|
|
97
127
|
},
|
|
98
128
|
{"name": "expr$string$2", "symbols": [{"literal":"É"}, {"literal":"N"}, {"literal":"U"}, {"literal":"L"}, {"literal":"O"}], "postprocess": function joiner(d) {return d.join('');}},
|
|
99
129
|
{"name": "expr", "symbols": ["field", "_", "expr$string$2"], "postprocess": d => {
|
|
130
|
+
const result = d[0]
|
|
131
|
+
if(!result) {
|
|
132
|
+
//console.log('ÉNULO')
|
|
133
|
+
return null
|
|
134
|
+
}
|
|
100
135
|
return {
|
|
101
136
|
v1: d[0],
|
|
102
137
|
operator: 'isNull'
|
|
@@ -105,13 +140,32 @@ var grammar = {
|
|
|
105
140
|
},
|
|
106
141
|
{"name": "expr$string$3", "symbols": [{"literal":"N"}, {"literal":"Ã"}, {"literal":"O"}], "postprocess": function joiner(d) {return d.join('');}},
|
|
107
142
|
{"name": "expr", "symbols": ["expr$string$3", "_", "expr"], "postprocess": d => {
|
|
143
|
+
const result = d[2]
|
|
144
|
+
if(!result) {
|
|
145
|
+
//console.log('NÃO')
|
|
146
|
+
return null
|
|
147
|
+
}
|
|
108
148
|
return {
|
|
109
149
|
not: d[2]
|
|
110
150
|
}
|
|
111
151
|
}
|
|
112
152
|
},
|
|
113
153
|
{"name": "expr", "symbols": [{"literal":"("}, "expr", {"literal":")"}], "postprocess": d => {
|
|
114
|
-
|
|
154
|
+
const result = d[1]
|
|
155
|
+
if(!result) {
|
|
156
|
+
//console.log('()')
|
|
157
|
+
return null
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
//if(result.includes('(')) {
|
|
161
|
+
// return null
|
|
162
|
+
//}
|
|
163
|
+
|
|
164
|
+
//if(result.includes(')')) {
|
|
165
|
+
// return null
|
|
166
|
+
//}
|
|
167
|
+
|
|
168
|
+
return result
|
|
115
169
|
}
|
|
116
170
|
},
|
|
117
171
|
{"name": "operator", "symbols": [{"literal":"="}]},
|
|
@@ -146,25 +200,72 @@ var grammar = {
|
|
|
146
200
|
},
|
|
147
201
|
{"name": "operator", "symbols": [{"literal":"É"}]},
|
|
148
202
|
{"name": "q_field", "symbols": [{"literal":"\""}, "freeText", {"literal":"\""}], "postprocess": d => {
|
|
203
|
+
let result = d[1]
|
|
204
|
+
if(!result) {
|
|
205
|
+
//console.log('q_field')
|
|
206
|
+
return null
|
|
207
|
+
}
|
|
208
|
+
|
|
209
|
+
if(result.includes('"')) {
|
|
210
|
+
return null
|
|
211
|
+
}
|
|
212
|
+
|
|
149
213
|
return {
|
|
150
214
|
dsl_type: 'field',
|
|
151
|
-
dsl_value:
|
|
215
|
+
dsl_value: result
|
|
152
216
|
}
|
|
153
217
|
} },
|
|
154
218
|
{"name": "field", "symbols": ["freeText"], "postprocess": d => {
|
|
219
|
+
const result = d[0]
|
|
220
|
+
if(!result) {
|
|
221
|
+
//console.log('field')
|
|
222
|
+
return null
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
if(result.includes('(')) {
|
|
226
|
+
return null
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
if(result.includes(')')) {
|
|
230
|
+
return null
|
|
231
|
+
}
|
|
232
|
+
|
|
155
233
|
return {
|
|
156
234
|
dsl_type: 'field',
|
|
157
|
-
dsl_value:
|
|
235
|
+
dsl_value: result
|
|
158
236
|
}
|
|
159
237
|
} },
|
|
160
238
|
{"name": "q_value", "symbols": [{"literal":"'"}, "freeText", {"literal":"'"}], "postprocess": d => {
|
|
239
|
+
let result = d[1]
|
|
240
|
+
if(!result) {
|
|
241
|
+
//console.log('q_value')
|
|
242
|
+
return null
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
if(result.includes("'")) {
|
|
246
|
+
return null
|
|
247
|
+
}
|
|
248
|
+
|
|
161
249
|
return {
|
|
162
250
|
dsl_type: 'value',
|
|
163
|
-
dsl_value:
|
|
251
|
+
dsl_value: result
|
|
164
252
|
}
|
|
165
253
|
} },
|
|
166
254
|
{"name": "value", "symbols": ["freeText"], "postprocess": d => {
|
|
167
255
|
const result = d[0]
|
|
256
|
+
if(!result) {
|
|
257
|
+
//console.log('value')
|
|
258
|
+
return null
|
|
259
|
+
}
|
|
260
|
+
|
|
261
|
+
if(result.includes('(')) {
|
|
262
|
+
return null
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
if(result.includes(')')) {
|
|
266
|
+
return null
|
|
267
|
+
}
|
|
268
|
+
|
|
168
269
|
return {
|
|
169
270
|
dsl_type: 'value',
|
|
170
271
|
dsl_value: result
|
|
@@ -178,16 +279,22 @@ var grammar = {
|
|
|
178
279
|
|
|
179
280
|
const removeChar = (sChar, eChar) => {
|
|
180
281
|
if(result.startsWith(sChar)) {
|
|
181
|
-
result =
|
|
282
|
+
result = ''
|
|
182
283
|
}
|
|
183
284
|
|
|
184
285
|
if(result.endsWith(eChar)) {
|
|
185
|
-
result =
|
|
286
|
+
result = ''
|
|
186
287
|
}
|
|
187
288
|
}
|
|
188
289
|
|
|
189
290
|
removeChar('(', ')')
|
|
190
291
|
removeChar("'", "'")
|
|
292
|
+
removeChar('"', '"')
|
|
293
|
+
|
|
294
|
+
////console.log({
|
|
295
|
+
// oResult,
|
|
296
|
+
// fResult: result
|
|
297
|
+
//})
|
|
191
298
|
|
|
192
299
|
return result
|
|
193
300
|
} },
|
package/fuql-grammar.ne
CHANGED
|
@@ -1,10 +1,18 @@
|
|
|
1
1
|
main -> ONDE {% d => {
|
|
2
|
+
if(!d[0]) {
|
|
3
|
+
//console.log('MAIN_ONDE')
|
|
4
|
+
return null
|
|
5
|
+
}
|
|
2
6
|
return {
|
|
3
7
|
mode: 'ONDE',
|
|
4
8
|
...d[0]
|
|
5
9
|
}
|
|
6
10
|
}
|
|
7
11
|
%} | query _ ONDE {% d => {
|
|
12
|
+
if(!d[2]) {
|
|
13
|
+
//console.log('MAIN query _ ONDE')
|
|
14
|
+
return null
|
|
15
|
+
}
|
|
8
16
|
return {
|
|
9
17
|
mode: 'query _ ONDE',
|
|
10
18
|
...d[0],
|
|
@@ -24,6 +32,10 @@ main -> ONDE {% d => {
|
|
|
24
32
|
%}
|
|
25
33
|
|
|
26
34
|
ONDE -> "ONDE" _ expr {% d => {
|
|
35
|
+
if(!d[2]) {
|
|
36
|
+
//console.log('ONDE')
|
|
37
|
+
return null
|
|
38
|
+
}
|
|
27
39
|
return {
|
|
28
40
|
where: d[2]
|
|
29
41
|
}
|
|
@@ -54,6 +66,16 @@ expr -> (field | q_field | q_value) _ operator _ (value | q_value | q_field) {%
|
|
|
54
66
|
['TERMINA COM']: 'endsWith'
|
|
55
67
|
}[d[2].join('')]
|
|
56
68
|
|
|
69
|
+
if(!d[0][0]) {
|
|
70
|
+
//console.log('OP1')
|
|
71
|
+
return null
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
if(!d[4][0]) {
|
|
75
|
+
//console.log('OP2')
|
|
76
|
+
return null
|
|
77
|
+
}
|
|
78
|
+
|
|
57
79
|
return {
|
|
58
80
|
v1: d[0][0],
|
|
59
81
|
v2: d[4][0],
|
|
@@ -61,6 +83,10 @@ expr -> (field | q_field | q_value) _ operator _ (value | q_value | q_field) {%
|
|
|
61
83
|
}
|
|
62
84
|
}
|
|
63
85
|
%} | expr _ "E" _ expr {% d => {
|
|
86
|
+
if(!d[0] || !d[4]) {
|
|
87
|
+
//console.log("E")
|
|
88
|
+
return null
|
|
89
|
+
}
|
|
64
90
|
return {
|
|
65
91
|
and: [
|
|
66
92
|
d[0],
|
|
@@ -69,6 +95,10 @@ expr -> (field | q_field | q_value) _ operator _ (value | q_value | q_field) {%
|
|
|
69
95
|
}
|
|
70
96
|
}
|
|
71
97
|
%} | expr _ "OU" _ expr {% d => {
|
|
98
|
+
if(!d[0] || !d[4]) {
|
|
99
|
+
//console.log('OU')
|
|
100
|
+
return null
|
|
101
|
+
}
|
|
72
102
|
return {
|
|
73
103
|
or: [
|
|
74
104
|
d[0],
|
|
@@ -77,18 +107,42 @@ expr -> (field | q_field | q_value) _ operator _ (value | q_value | q_field) {%
|
|
|
77
107
|
}
|
|
78
108
|
}
|
|
79
109
|
%} | field _ "ÉNULO" {% d => {
|
|
110
|
+
const result = d[0]
|
|
111
|
+
if(!result) {
|
|
112
|
+
//console.log('ÉNULO')
|
|
113
|
+
return null
|
|
114
|
+
}
|
|
80
115
|
return {
|
|
81
116
|
v1: d[0],
|
|
82
117
|
operator: 'isNull'
|
|
83
118
|
}
|
|
84
119
|
}
|
|
85
120
|
%} | "NÃO" _ expr {% d => {
|
|
121
|
+
const result = d[2]
|
|
122
|
+
if(!result) {
|
|
123
|
+
//console.log('NÃO')
|
|
124
|
+
return null
|
|
125
|
+
}
|
|
86
126
|
return {
|
|
87
127
|
not: d[2]
|
|
88
128
|
}
|
|
89
129
|
}
|
|
90
130
|
%} | "(" expr ")" {% d => {
|
|
91
|
-
|
|
131
|
+
const result = d[1]
|
|
132
|
+
if(!result) {
|
|
133
|
+
//console.log('()')
|
|
134
|
+
return null
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
//if(result.includes('(')) {
|
|
138
|
+
// return null
|
|
139
|
+
//}
|
|
140
|
+
|
|
141
|
+
//if(result.includes(')')) {
|
|
142
|
+
// return null
|
|
143
|
+
//}
|
|
144
|
+
|
|
145
|
+
return result
|
|
92
146
|
}
|
|
93
147
|
%}
|
|
94
148
|
|
|
@@ -109,25 +163,72 @@ operator -> "=" | "<" | ">" | "<=" | ">=" | "~" | "CONTEM" | "INICIA" _ "COM" {%
|
|
|
109
163
|
%} | "É"
|
|
110
164
|
|
|
111
165
|
q_field -> "\"" freeText "\"" {% d => {
|
|
166
|
+
let result = d[1]
|
|
167
|
+
if(!result) {
|
|
168
|
+
//console.log('q_field')
|
|
169
|
+
return null
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
if(result.includes('"')) {
|
|
173
|
+
return null
|
|
174
|
+
}
|
|
175
|
+
|
|
112
176
|
return {
|
|
113
177
|
dsl_type: 'field',
|
|
114
|
-
dsl_value:
|
|
178
|
+
dsl_value: result
|
|
115
179
|
}
|
|
116
180
|
} %}
|
|
117
181
|
field -> freeText {% d => {
|
|
182
|
+
const result = d[0]
|
|
183
|
+
if(!result) {
|
|
184
|
+
//console.log('field')
|
|
185
|
+
return null
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
if(result.includes('(')) {
|
|
189
|
+
return null
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
if(result.includes(')')) {
|
|
193
|
+
return null
|
|
194
|
+
}
|
|
195
|
+
|
|
118
196
|
return {
|
|
119
197
|
dsl_type: 'field',
|
|
120
|
-
dsl_value:
|
|
198
|
+
dsl_value: result
|
|
121
199
|
}
|
|
122
200
|
} %}
|
|
123
201
|
q_value -> "'" freeText "'" {% d => {
|
|
202
|
+
let result = d[1]
|
|
203
|
+
if(!result) {
|
|
204
|
+
//console.log('q_value')
|
|
205
|
+
return null
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
if(result.includes("'")) {
|
|
209
|
+
return null
|
|
210
|
+
}
|
|
211
|
+
|
|
124
212
|
return {
|
|
125
213
|
dsl_type: 'value',
|
|
126
|
-
dsl_value:
|
|
214
|
+
dsl_value: result
|
|
127
215
|
}
|
|
128
216
|
} %}
|
|
129
217
|
value -> freeText {% d => {
|
|
130
218
|
const result = d[0]
|
|
219
|
+
if(!result) {
|
|
220
|
+
//console.log('value')
|
|
221
|
+
return null
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
if(result.includes('(')) {
|
|
225
|
+
return null
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
if(result.includes(')')) {
|
|
229
|
+
return null
|
|
230
|
+
}
|
|
231
|
+
|
|
131
232
|
return {
|
|
132
233
|
dsl_type: 'value',
|
|
133
234
|
dsl_value: result
|
|
@@ -140,16 +241,22 @@ freeText -> .:+ {% d => {
|
|
|
140
241
|
|
|
141
242
|
const removeChar = (sChar, eChar) => {
|
|
142
243
|
if(result.startsWith(sChar)) {
|
|
143
|
-
result =
|
|
244
|
+
result = ''
|
|
144
245
|
}
|
|
145
246
|
|
|
146
247
|
if(result.endsWith(eChar)) {
|
|
147
|
-
result =
|
|
248
|
+
result = ''
|
|
148
249
|
}
|
|
149
250
|
}
|
|
150
251
|
|
|
151
252
|
removeChar('(', ')')
|
|
152
253
|
removeChar("'", "'")
|
|
254
|
+
removeChar('"', '"')
|
|
255
|
+
|
|
256
|
+
////console.log({
|
|
257
|
+
// oResult,
|
|
258
|
+
// fResult: result
|
|
259
|
+
//})
|
|
153
260
|
|
|
154
261
|
return result
|
|
155
262
|
} %}
|