@puca/puca-core 12.13.14 → 13.0.0
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/abstract-controller.d.ts +2 -1
- package/dist/core/services/abstract-controller.js +10 -0
- package/dist/core/services/abstract-controller.js.map +1 -1
- package/dist/core/services/crud-base-testable.service.js +4 -1
- package/dist/core/services/crud-base-testable.service.js.map +1 -1
- package/dist/core/services/index.js +1 -1
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.js +2 -1
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/llm/llm.service.d.ts +27 -23
- package/dist/core/services/llm/llm.service.js +23 -8
- package/dist/core/services/llm/llm.service.js.map +1 -1
- package/dist/core/services/monitor.d.ts +1 -1
- package/dist/core/services/monitor.js +3 -3
- package/dist/core/services/monitor.js.map +1 -1
- package/dist/models/crud-controller-especification-environment.d.ts +11 -3
- package/dist/models/crud-controller-especification-environment.js.map +1 -1
- package/dist/models/crud-controller-especification.d.ts +1 -1
- package/dist/orm/cases/vanilla/sql-builder/select.service.js +20 -18
- package/dist/orm/cases/vanilla/sql-builder/select.service.js.map +1 -1
- package/dist/orm/services/transaction.js +3 -1
- package/dist/orm/services/transaction.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.map +1 -1
- package/dist/plugins/nestjs/puca-auth.decorators.js +3 -0
- package/dist/plugins/nestjs/puca-auth.decorators.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/fuql-grammar.js +76 -76
- package/fuql-grammar.ne +65 -66
- package/fuql-snapshot/COMAC_MATERIAL_DE_CONSTRUCAO_L_ONDE__Cliente____Chave__nica_____43767__E__Nota_Fiscal____Data______02_06_2025_.json +55 -0
- package/fuql-snapshot/ONDE_N_O_f4___v5_E_f5___v6.json +39 -0
- package/fuql-snapshot/ONDE_Responsavel_CONTEM_raphael.json +17 -0
- package/fuql-snapshot/ONDE_Responsavel__CONTEM_raphael.json +31 -0
- package/fuql-snapshot/ONDE__123_____123_.json +19 -0
- package/fuql-snapshot/ONDE__Etapa____Nome____teste.json +17 -0
- package/fuql-snapshot/ONDE__N_O_f4___v5_E_f5___v6_.json +43 -0
- package/fuql-snapshot/ONDE___idade___18__E__nome____Raphael__OU_nome____Carvalho__.json +104 -0
- package/fuql-snapshot/ONDE__nome_____sobrenome_.json +19 -0
- package/fuql-snapshot/ONDE_data___01_01_2023.json +16 -0
- package/fuql-snapshot/ONDE_nome___1_000_00.json +16 -0
- package/fuql-snapshot/ONDE_nome___Raphael_Carvalho_de_Aguiar.json +16 -0
- package/fuql-snapshot/ONDE_nome____.json +16 -0
- package/fuql-snapshot/ONDE_nome_____Raphael__E_N_O_sobrenome____Carvalho_.json +46 -0
- package/fuql-snapshot/ONDE_responsavel___puca_user.json +16 -0
- package/fuql-snapshot/a223.json +6 -0
- package/fuql-snapshot/bom_dia_ONDE_nome____Raphael_Carvalho_de_Aguiar_.json +18 -0
- package/package.json +1 -1
package/fuql-grammar.js
CHANGED
|
@@ -2,12 +2,38 @@
|
|
|
2
2
|
// http://github.com/Hardmath123/nearley
|
|
3
3
|
(function () {
|
|
4
4
|
function id(x) { return x[0]; }
|
|
5
|
+
|
|
6
|
+
const hasReservedKeyWords = (d) => {
|
|
7
|
+
const reservedKeyWords = [
|
|
8
|
+
'ONDE',
|
|
9
|
+
'E',
|
|
10
|
+
'OU',
|
|
11
|
+
'ÉNULO',
|
|
12
|
+
'NÃO',
|
|
13
|
+
'INICIA COM',
|
|
14
|
+
'TERMINA COM',
|
|
15
|
+
'CONTEM',
|
|
16
|
+
'É',
|
|
17
|
+
"'",
|
|
18
|
+
'"',
|
|
19
|
+
'!=',
|
|
20
|
+
'=',
|
|
21
|
+
'<',
|
|
22
|
+
'>',
|
|
23
|
+
'<=',
|
|
24
|
+
'>=',
|
|
25
|
+
'~',
|
|
26
|
+
"(",
|
|
27
|
+
")",
|
|
28
|
+
]
|
|
29
|
+
const hasReservedWords = reservedKeyWords.some(word => d.includes(word))
|
|
30
|
+
return hasReservedWords
|
|
31
|
+
}
|
|
5
32
|
var grammar = {
|
|
6
33
|
Lexer: undefined,
|
|
7
34
|
ParserRules: [
|
|
8
35
|
{"name": "main", "symbols": ["ONDE"], "postprocess": d => {
|
|
9
36
|
if(!d[0]) {
|
|
10
|
-
//console.log('MAIN_ONDE')
|
|
11
37
|
return null
|
|
12
38
|
}
|
|
13
39
|
return {
|
|
@@ -18,7 +44,6 @@ var grammar = {
|
|
|
18
44
|
},
|
|
19
45
|
{"name": "main", "symbols": ["query", "_", "ONDE"], "postprocess": d => {
|
|
20
46
|
if(!d[2]) {
|
|
21
|
-
//console.log('MAIN query _ ONDE')
|
|
22
47
|
return null
|
|
23
48
|
}
|
|
24
49
|
return {
|
|
@@ -42,7 +67,6 @@ var grammar = {
|
|
|
42
67
|
{"name": "ONDE$string$1", "symbols": [{"literal":"O"}, {"literal":"N"}, {"literal":"D"}, {"literal":"E"}], "postprocess": function joiner(d) {return d.join('');}},
|
|
43
68
|
{"name": "ONDE", "symbols": ["ONDE$string$1", "_", "expr"], "postprocess": d => {
|
|
44
69
|
if(!d[2]) {
|
|
45
|
-
//console.log('ONDE')
|
|
46
70
|
return null
|
|
47
71
|
}
|
|
48
72
|
return {
|
|
@@ -68,6 +92,24 @@ var grammar = {
|
|
|
68
92
|
{"name": "expr$subexpression$2", "symbols": ["q_value"]},
|
|
69
93
|
{"name": "expr$subexpression$2", "symbols": ["q_field"]},
|
|
70
94
|
{"name": "expr", "symbols": ["expr$subexpression$1", "_", "operator", "_", "expr$subexpression$2"], "postprocess": d => {
|
|
95
|
+
if(!d[0][0]) {
|
|
96
|
+
return null
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
if(!d[4][0]) {
|
|
100
|
+
return null
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
if(d[2].join('') === '!=') {
|
|
104
|
+
return {
|
|
105
|
+
not: {
|
|
106
|
+
v1: d[0][0],
|
|
107
|
+
v2: d[4][0],
|
|
108
|
+
operator: 'equals'
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
|
|
71
113
|
const operatorStr = {
|
|
72
114
|
['=']: 'equals',
|
|
73
115
|
['<']: 'less',
|
|
@@ -81,16 +123,6 @@ var grammar = {
|
|
|
81
123
|
['TERMINA COM']: 'endsWith'
|
|
82
124
|
}[d[2].join('')]
|
|
83
125
|
|
|
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
|
-
|
|
94
126
|
return {
|
|
95
127
|
v1: d[0][0],
|
|
96
128
|
v2: d[4][0],
|
|
@@ -100,7 +132,6 @@ var grammar = {
|
|
|
100
132
|
},
|
|
101
133
|
{"name": "expr", "symbols": ["expr", "_", {"literal":"E"}, "_", "expr"], "postprocess": d => {
|
|
102
134
|
if(!d[0] || !d[4]) {
|
|
103
|
-
//console.log("E")
|
|
104
135
|
return null
|
|
105
136
|
}
|
|
106
137
|
return {
|
|
@@ -114,7 +145,6 @@ var grammar = {
|
|
|
114
145
|
{"name": "expr$string$1", "symbols": [{"literal":"O"}, {"literal":"U"}], "postprocess": function joiner(d) {return d.join('');}},
|
|
115
146
|
{"name": "expr", "symbols": ["expr", "_", "expr$string$1", "_", "expr"], "postprocess": d => {
|
|
116
147
|
if(!d[0] || !d[4]) {
|
|
117
|
-
//console.log('OU')
|
|
118
148
|
return null
|
|
119
149
|
}
|
|
120
150
|
return {
|
|
@@ -129,7 +159,6 @@ var grammar = {
|
|
|
129
159
|
{"name": "expr", "symbols": ["field", "_", "expr$string$2"], "postprocess": d => {
|
|
130
160
|
const result = d[0]
|
|
131
161
|
if(!result) {
|
|
132
|
-
//console.log('ÉNULO')
|
|
133
162
|
return null
|
|
134
163
|
}
|
|
135
164
|
return {
|
|
@@ -142,45 +171,49 @@ var grammar = {
|
|
|
142
171
|
{"name": "expr", "symbols": ["expr$string$3", "_", "expr"], "postprocess": d => {
|
|
143
172
|
const result = d[2]
|
|
144
173
|
if(!result) {
|
|
145
|
-
//console.log('NÃO')
|
|
146
174
|
return null
|
|
147
175
|
}
|
|
176
|
+
|
|
177
|
+
if(result.and && !result.parenthesis) {
|
|
178
|
+
return null
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
if(result.or && !result.parenthesis) {
|
|
182
|
+
return null
|
|
183
|
+
}
|
|
184
|
+
|
|
148
185
|
return {
|
|
149
|
-
not:
|
|
186
|
+
not: result
|
|
150
187
|
}
|
|
151
188
|
}
|
|
152
189
|
},
|
|
153
190
|
{"name": "expr", "symbols": [{"literal":"("}, "expr", {"literal":")"}], "postprocess": d => {
|
|
154
191
|
const result = d[1]
|
|
155
192
|
if(!result) {
|
|
156
|
-
//console.log('()')
|
|
157
193
|
return null
|
|
158
194
|
}
|
|
159
195
|
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
//if(result.includes(')')) {
|
|
165
|
-
// return null
|
|
166
|
-
//}
|
|
167
|
-
|
|
168
|
-
return result
|
|
196
|
+
return {
|
|
197
|
+
parenthesis: true,
|
|
198
|
+
...result,
|
|
199
|
+
}
|
|
169
200
|
}
|
|
170
201
|
},
|
|
202
|
+
{"name": "operator$string$1", "symbols": [{"literal":"!"}, {"literal":"="}], "postprocess": function joiner(d) {return d.join('');}},
|
|
203
|
+
{"name": "operator", "symbols": ["operator$string$1"]},
|
|
171
204
|
{"name": "operator", "symbols": [{"literal":"="}]},
|
|
172
205
|
{"name": "operator", "symbols": [{"literal":"<"}]},
|
|
173
206
|
{"name": "operator", "symbols": [{"literal":">"}]},
|
|
174
|
-
{"name": "operator$string$
|
|
175
|
-
{"name": "operator", "symbols": ["operator$string$1"]},
|
|
176
|
-
{"name": "operator$string$2", "symbols": [{"literal":">"}, {"literal":"="}], "postprocess": function joiner(d) {return d.join('');}},
|
|
207
|
+
{"name": "operator$string$2", "symbols": [{"literal":"<"}, {"literal":"="}], "postprocess": function joiner(d) {return d.join('');}},
|
|
177
208
|
{"name": "operator", "symbols": ["operator$string$2"]},
|
|
178
|
-
{"name": "operator", "symbols": [{"literal":"
|
|
179
|
-
{"name": "operator$string$3", "symbols": [{"literal":"C"}, {"literal":"O"}, {"literal":"N"}, {"literal":"T"}, {"literal":"E"}, {"literal":"M"}], "postprocess": function joiner(d) {return d.join('');}},
|
|
209
|
+
{"name": "operator$string$3", "symbols": [{"literal":">"}, {"literal":"="}], "postprocess": function joiner(d) {return d.join('');}},
|
|
180
210
|
{"name": "operator", "symbols": ["operator$string$3"]},
|
|
181
|
-
{"name": "operator
|
|
182
|
-
{"name": "operator$string$
|
|
183
|
-
{"name": "operator", "symbols": ["operator$string$4"
|
|
211
|
+
{"name": "operator", "symbols": [{"literal":"~"}]},
|
|
212
|
+
{"name": "operator$string$4", "symbols": [{"literal":"C"}, {"literal":"O"}, {"literal":"N"}, {"literal":"T"}, {"literal":"E"}, {"literal":"M"}], "postprocess": function joiner(d) {return d.join('');}},
|
|
213
|
+
{"name": "operator", "symbols": ["operator$string$4"]},
|
|
214
|
+
{"name": "operator$string$5", "symbols": [{"literal":"I"}, {"literal":"N"}, {"literal":"I"}, {"literal":"C"}, {"literal":"I"}, {"literal":"A"}], "postprocess": function joiner(d) {return d.join('');}},
|
|
215
|
+
{"name": "operator$string$6", "symbols": [{"literal":"C"}, {"literal":"O"}, {"literal":"M"}], "postprocess": function joiner(d) {return d.join('');}},
|
|
216
|
+
{"name": "operator", "symbols": ["operator$string$5", "_", "operator$string$6"], "postprocess": d => {
|
|
184
217
|
const result = d
|
|
185
218
|
.filter(d => d)
|
|
186
219
|
.join(' ')
|
|
@@ -188,9 +221,9 @@ var grammar = {
|
|
|
188
221
|
return result
|
|
189
222
|
}
|
|
190
223
|
},
|
|
191
|
-
{"name": "operator$string$
|
|
192
|
-
{"name": "operator$string$
|
|
193
|
-
{"name": "operator", "symbols": ["operator$string$
|
|
224
|
+
{"name": "operator$string$7", "symbols": [{"literal":"T"}, {"literal":"E"}, {"literal":"R"}, {"literal":"M"}, {"literal":"I"}, {"literal":"N"}, {"literal":"A"}], "postprocess": function joiner(d) {return d.join('');}},
|
|
225
|
+
{"name": "operator$string$8", "symbols": [{"literal":"C"}, {"literal":"O"}, {"literal":"M"}], "postprocess": function joiner(d) {return d.join('');}},
|
|
226
|
+
{"name": "operator", "symbols": ["operator$string$7", "_", "operator$string$8"], "postprocess": d => {
|
|
194
227
|
const result = d
|
|
195
228
|
.filter(d => d)
|
|
196
229
|
.join(' ')
|
|
@@ -202,7 +235,6 @@ var grammar = {
|
|
|
202
235
|
{"name": "q_field", "symbols": [{"literal":"\""}, "freeText", {"literal":"\""}], "postprocess": d => {
|
|
203
236
|
let result = d[1]
|
|
204
237
|
if(!result) {
|
|
205
|
-
//console.log('q_field')
|
|
206
238
|
return null
|
|
207
239
|
}
|
|
208
240
|
|
|
@@ -218,18 +250,13 @@ var grammar = {
|
|
|
218
250
|
{"name": "field", "symbols": ["freeText"], "postprocess": d => {
|
|
219
251
|
const result = d[0]
|
|
220
252
|
if(!result) {
|
|
221
|
-
//console.log('field')
|
|
222
|
-
return null
|
|
223
|
-
}
|
|
224
|
-
|
|
225
|
-
if(result.includes('(')) {
|
|
226
253
|
return null
|
|
227
254
|
}
|
|
228
255
|
|
|
229
|
-
if(result
|
|
256
|
+
if(hasReservedKeyWords(result)) {
|
|
230
257
|
return null
|
|
231
258
|
}
|
|
232
|
-
|
|
259
|
+
|
|
233
260
|
return {
|
|
234
261
|
dsl_type: 'field',
|
|
235
262
|
dsl_value: result
|
|
@@ -238,7 +265,6 @@ var grammar = {
|
|
|
238
265
|
{"name": "q_value", "symbols": [{"literal":"'"}, "freeText", {"literal":"'"}], "postprocess": d => {
|
|
239
266
|
let result = d[1]
|
|
240
267
|
if(!result) {
|
|
241
|
-
//console.log('q_value')
|
|
242
268
|
return null
|
|
243
269
|
}
|
|
244
270
|
|
|
@@ -254,15 +280,10 @@ var grammar = {
|
|
|
254
280
|
{"name": "value", "symbols": ["freeText"], "postprocess": d => {
|
|
255
281
|
const result = d[0]
|
|
256
282
|
if(!result) {
|
|
257
|
-
//console.log('value')
|
|
258
283
|
return null
|
|
259
284
|
}
|
|
260
285
|
|
|
261
|
-
if(result
|
|
262
|
-
return null
|
|
263
|
-
}
|
|
264
|
-
|
|
265
|
-
if(result.includes(')')) {
|
|
286
|
+
if(hasReservedKeyWords(result)) {
|
|
266
287
|
return null
|
|
267
288
|
}
|
|
268
289
|
|
|
@@ -274,28 +295,7 @@ var grammar = {
|
|
|
274
295
|
{"name": "freeText$ebnf$1", "symbols": [/./]},
|
|
275
296
|
{"name": "freeText$ebnf$1", "symbols": ["freeText$ebnf$1", /./], "postprocess": function arrpush(d) {return d[0].concat([d[1]]);}},
|
|
276
297
|
{"name": "freeText", "symbols": ["freeText$ebnf$1"], "postprocess": d => {
|
|
277
|
-
const
|
|
278
|
-
let result = oResult
|
|
279
|
-
|
|
280
|
-
const removeChar = (sChar, eChar) => {
|
|
281
|
-
if(result.startsWith(sChar)) {
|
|
282
|
-
result = ''
|
|
283
|
-
}
|
|
284
|
-
|
|
285
|
-
if(result.endsWith(eChar)) {
|
|
286
|
-
result = ''
|
|
287
|
-
}
|
|
288
|
-
}
|
|
289
|
-
|
|
290
|
-
removeChar('(', ')')
|
|
291
|
-
removeChar("'", "'")
|
|
292
|
-
removeChar('"', '"')
|
|
293
|
-
|
|
294
|
-
////console.log({
|
|
295
|
-
// oResult,
|
|
296
|
-
// fResult: result
|
|
297
|
-
//})
|
|
298
|
-
|
|
298
|
+
const result = (d[0] || []).join('').trim()
|
|
299
299
|
return result
|
|
300
300
|
} },
|
|
301
301
|
{"name": "ident$ebnf$1", "symbols": [/[a-zA-z0-9À-ÖØ-öø-ÿ]/]},
|
package/fuql-grammar.ne
CHANGED
|
@@ -1,6 +1,33 @@
|
|
|
1
|
+
@{%
|
|
2
|
+
const hasReservedKeyWords = (d) => {
|
|
3
|
+
const reservedKeyWords = [
|
|
4
|
+
'ONDE',
|
|
5
|
+
'E',
|
|
6
|
+
'OU',
|
|
7
|
+
'ÉNULO',
|
|
8
|
+
'NÃO',
|
|
9
|
+
'INICIA COM',
|
|
10
|
+
'TERMINA COM',
|
|
11
|
+
'CONTEM',
|
|
12
|
+
'É',
|
|
13
|
+
"'",
|
|
14
|
+
'"',
|
|
15
|
+
'!=',
|
|
16
|
+
'=',
|
|
17
|
+
'<',
|
|
18
|
+
'>',
|
|
19
|
+
'<=',
|
|
20
|
+
'>=',
|
|
21
|
+
'~',
|
|
22
|
+
"(",
|
|
23
|
+
")",
|
|
24
|
+
]
|
|
25
|
+
const hasReservedWords = reservedKeyWords.some(word => d.includes(word))
|
|
26
|
+
return hasReservedWords
|
|
27
|
+
}
|
|
28
|
+
%}
|
|
1
29
|
main -> ONDE {% d => {
|
|
2
30
|
if(!d[0]) {
|
|
3
|
-
//console.log('MAIN_ONDE')
|
|
4
31
|
return null
|
|
5
32
|
}
|
|
6
33
|
return {
|
|
@@ -10,7 +37,6 @@ main -> ONDE {% d => {
|
|
|
10
37
|
}
|
|
11
38
|
%} | query _ ONDE {% d => {
|
|
12
39
|
if(!d[2]) {
|
|
13
|
-
//console.log('MAIN query _ ONDE')
|
|
14
40
|
return null
|
|
15
41
|
}
|
|
16
42
|
return {
|
|
@@ -33,7 +59,6 @@ main -> ONDE {% d => {
|
|
|
33
59
|
|
|
34
60
|
ONDE -> "ONDE" _ expr {% d => {
|
|
35
61
|
if(!d[2]) {
|
|
36
|
-
//console.log('ONDE')
|
|
37
62
|
return null
|
|
38
63
|
}
|
|
39
64
|
return {
|
|
@@ -53,6 +78,24 @@ query -> [a-zA-Z0-9 ]:+ {% d => {
|
|
|
53
78
|
}%}
|
|
54
79
|
|
|
55
80
|
expr -> (field | q_field | q_value) _ operator _ (value | q_value | q_field) {% d => {
|
|
81
|
+
if(!d[0][0]) {
|
|
82
|
+
return null
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
if(!d[4][0]) {
|
|
86
|
+
return null
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
if(d[2].join('') === '!=') {
|
|
90
|
+
return {
|
|
91
|
+
not: {
|
|
92
|
+
v1: d[0][0],
|
|
93
|
+
v2: d[4][0],
|
|
94
|
+
operator: 'equals'
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
|
|
56
99
|
const operatorStr = {
|
|
57
100
|
['=']: 'equals',
|
|
58
101
|
['<']: 'less',
|
|
@@ -66,16 +109,6 @@ expr -> (field | q_field | q_value) _ operator _ (value | q_value | q_field) {%
|
|
|
66
109
|
['TERMINA COM']: 'endsWith'
|
|
67
110
|
}[d[2].join('')]
|
|
68
111
|
|
|
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
|
-
|
|
79
112
|
return {
|
|
80
113
|
v1: d[0][0],
|
|
81
114
|
v2: d[4][0],
|
|
@@ -84,7 +117,6 @@ expr -> (field | q_field | q_value) _ operator _ (value | q_value | q_field) {%
|
|
|
84
117
|
}
|
|
85
118
|
%} | expr _ "E" _ expr {% d => {
|
|
86
119
|
if(!d[0] || !d[4]) {
|
|
87
|
-
//console.log("E")
|
|
88
120
|
return null
|
|
89
121
|
}
|
|
90
122
|
return {
|
|
@@ -96,7 +128,6 @@ expr -> (field | q_field | q_value) _ operator _ (value | q_value | q_field) {%
|
|
|
96
128
|
}
|
|
97
129
|
%} | expr _ "OU" _ expr {% d => {
|
|
98
130
|
if(!d[0] || !d[4]) {
|
|
99
|
-
//console.log('OU')
|
|
100
131
|
return null
|
|
101
132
|
}
|
|
102
133
|
return {
|
|
@@ -109,7 +140,6 @@ expr -> (field | q_field | q_value) _ operator _ (value | q_value | q_field) {%
|
|
|
109
140
|
%} | field _ "ÉNULO" {% d => {
|
|
110
141
|
const result = d[0]
|
|
111
142
|
if(!result) {
|
|
112
|
-
//console.log('ÉNULO')
|
|
113
143
|
return null
|
|
114
144
|
}
|
|
115
145
|
return {
|
|
@@ -120,33 +150,35 @@ expr -> (field | q_field | q_value) _ operator _ (value | q_value | q_field) {%
|
|
|
120
150
|
%} | "NÃO" _ expr {% d => {
|
|
121
151
|
const result = d[2]
|
|
122
152
|
if(!result) {
|
|
123
|
-
//console.log('NÃO')
|
|
124
153
|
return null
|
|
125
154
|
}
|
|
155
|
+
|
|
156
|
+
if(result.and && !result.parenthesis) {
|
|
157
|
+
return null
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
if(result.or && !result.parenthesis) {
|
|
161
|
+
return null
|
|
162
|
+
}
|
|
163
|
+
|
|
126
164
|
return {
|
|
127
|
-
not:
|
|
165
|
+
not: result
|
|
128
166
|
}
|
|
129
167
|
}
|
|
130
168
|
%} | "(" expr ")" {% d => {
|
|
131
169
|
const result = d[1]
|
|
132
170
|
if(!result) {
|
|
133
|
-
//console.log('()')
|
|
134
171
|
return null
|
|
135
172
|
}
|
|
136
173
|
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
//if(result.includes(')')) {
|
|
142
|
-
// return null
|
|
143
|
-
//}
|
|
144
|
-
|
|
145
|
-
return result
|
|
174
|
+
return {
|
|
175
|
+
parenthesis: true,
|
|
176
|
+
...result,
|
|
177
|
+
}
|
|
146
178
|
}
|
|
147
179
|
%}
|
|
148
180
|
|
|
149
|
-
operator -> "=" | "<" | ">" | "<=" | ">=" | "~" | "CONTEM" | "INICIA" _ "COM" {% d => {
|
|
181
|
+
operator -> "!=" | "=" | "<" | ">" | "<=" | ">=" | "~" | "CONTEM" | "INICIA" _ "COM" {% d => {
|
|
150
182
|
const result = d
|
|
151
183
|
.filter(d => d)
|
|
152
184
|
.join(' ')
|
|
@@ -165,7 +197,6 @@ operator -> "=" | "<" | ">" | "<=" | ">=" | "~" | "CONTEM" | "INICIA" _ "COM" {%
|
|
|
165
197
|
q_field -> "\"" freeText "\"" {% d => {
|
|
166
198
|
let result = d[1]
|
|
167
199
|
if(!result) {
|
|
168
|
-
//console.log('q_field')
|
|
169
200
|
return null
|
|
170
201
|
}
|
|
171
202
|
|
|
@@ -181,18 +212,13 @@ q_field -> "\"" freeText "\"" {% d => {
|
|
|
181
212
|
field -> freeText {% d => {
|
|
182
213
|
const result = d[0]
|
|
183
214
|
if(!result) {
|
|
184
|
-
//console.log('field')
|
|
185
|
-
return null
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
if(result.includes('(')) {
|
|
189
215
|
return null
|
|
190
216
|
}
|
|
191
217
|
|
|
192
|
-
if(result
|
|
218
|
+
if(hasReservedKeyWords(result)) {
|
|
193
219
|
return null
|
|
194
220
|
}
|
|
195
|
-
|
|
221
|
+
|
|
196
222
|
return {
|
|
197
223
|
dsl_type: 'field',
|
|
198
224
|
dsl_value: result
|
|
@@ -201,7 +227,6 @@ field -> freeText {% d => {
|
|
|
201
227
|
q_value -> "'" freeText "'" {% d => {
|
|
202
228
|
let result = d[1]
|
|
203
229
|
if(!result) {
|
|
204
|
-
//console.log('q_value')
|
|
205
230
|
return null
|
|
206
231
|
}
|
|
207
232
|
|
|
@@ -217,15 +242,10 @@ q_value -> "'" freeText "'" {% d => {
|
|
|
217
242
|
value -> freeText {% d => {
|
|
218
243
|
const result = d[0]
|
|
219
244
|
if(!result) {
|
|
220
|
-
//console.log('value')
|
|
221
245
|
return null
|
|
222
246
|
}
|
|
223
247
|
|
|
224
|
-
if(result
|
|
225
|
-
return null
|
|
226
|
-
}
|
|
227
|
-
|
|
228
|
-
if(result.includes(')')) {
|
|
248
|
+
if(hasReservedKeyWords(result)) {
|
|
229
249
|
return null
|
|
230
250
|
}
|
|
231
251
|
|
|
@@ -236,28 +256,7 @@ value -> freeText {% d => {
|
|
|
236
256
|
} %}
|
|
237
257
|
|
|
238
258
|
freeText -> .:+ {% d => {
|
|
239
|
-
const
|
|
240
|
-
let result = oResult
|
|
241
|
-
|
|
242
|
-
const removeChar = (sChar, eChar) => {
|
|
243
|
-
if(result.startsWith(sChar)) {
|
|
244
|
-
result = ''
|
|
245
|
-
}
|
|
246
|
-
|
|
247
|
-
if(result.endsWith(eChar)) {
|
|
248
|
-
result = ''
|
|
249
|
-
}
|
|
250
|
-
}
|
|
251
|
-
|
|
252
|
-
removeChar('(', ')')
|
|
253
|
-
removeChar("'", "'")
|
|
254
|
-
removeChar('"', '"')
|
|
255
|
-
|
|
256
|
-
////console.log({
|
|
257
|
-
// oResult,
|
|
258
|
-
// fResult: result
|
|
259
|
-
//})
|
|
260
|
-
|
|
259
|
+
const result = (d[0] || []).join('').trim()
|
|
261
260
|
return result
|
|
262
261
|
} %}
|
|
263
262
|
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
[
|
|
2
|
+
null,
|
|
3
|
+
null,
|
|
4
|
+
null,
|
|
5
|
+
null,
|
|
6
|
+
{
|
|
7
|
+
"mode": "query _ ONDE",
|
|
8
|
+
"query": "COMAC MATERIAL DE CONSTRUCAO L",
|
|
9
|
+
"where": {
|
|
10
|
+
"and": [
|
|
11
|
+
{
|
|
12
|
+
"v1": {
|
|
13
|
+
"dsl_type": "field",
|
|
14
|
+
"dsl_value": "Cliente -> Chave Única"
|
|
15
|
+
},
|
|
16
|
+
"v2": {
|
|
17
|
+
"dsl_type": "value",
|
|
18
|
+
"dsl_value": "43767"
|
|
19
|
+
},
|
|
20
|
+
"operator": "equals"
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
"v1": {
|
|
24
|
+
"dsl_type": "field",
|
|
25
|
+
"dsl_value": "Nota Fiscal -> Data"
|
|
26
|
+
},
|
|
27
|
+
"v2": {
|
|
28
|
+
"dsl_type": "value",
|
|
29
|
+
"dsl_value": "02/06/2025"
|
|
30
|
+
},
|
|
31
|
+
"operator": "greaterOrEquals"
|
|
32
|
+
}
|
|
33
|
+
]
|
|
34
|
+
}
|
|
35
|
+
},
|
|
36
|
+
null,
|
|
37
|
+
null,
|
|
38
|
+
null,
|
|
39
|
+
null,
|
|
40
|
+
null,
|
|
41
|
+
null,
|
|
42
|
+
null,
|
|
43
|
+
null,
|
|
44
|
+
null,
|
|
45
|
+
null,
|
|
46
|
+
null,
|
|
47
|
+
null,
|
|
48
|
+
null,
|
|
49
|
+
null,
|
|
50
|
+
null,
|
|
51
|
+
null,
|
|
52
|
+
null,
|
|
53
|
+
null,
|
|
54
|
+
null
|
|
55
|
+
]
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
[
|
|
2
|
+
null,
|
|
3
|
+
null,
|
|
4
|
+
null,
|
|
5
|
+
null,
|
|
6
|
+
null,
|
|
7
|
+
{
|
|
8
|
+
"mode": "ONDE",
|
|
9
|
+
"where": {
|
|
10
|
+
"and": [
|
|
11
|
+
{
|
|
12
|
+
"not": {
|
|
13
|
+
"v1": {
|
|
14
|
+
"dsl_type": "field",
|
|
15
|
+
"dsl_value": "f4"
|
|
16
|
+
},
|
|
17
|
+
"v2": {
|
|
18
|
+
"dsl_type": "value",
|
|
19
|
+
"dsl_value": "v5"
|
|
20
|
+
},
|
|
21
|
+
"operator": "equals"
|
|
22
|
+
}
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
"v1": {
|
|
26
|
+
"dsl_type": "field",
|
|
27
|
+
"dsl_value": "f5"
|
|
28
|
+
},
|
|
29
|
+
"v2": {
|
|
30
|
+
"dsl_type": "value",
|
|
31
|
+
"dsl_value": "v6"
|
|
32
|
+
},
|
|
33
|
+
"operator": "equals"
|
|
34
|
+
}
|
|
35
|
+
]
|
|
36
|
+
}
|
|
37
|
+
},
|
|
38
|
+
null
|
|
39
|
+
]
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
[
|
|
2
|
+
null,
|
|
3
|
+
{
|
|
4
|
+
"mode": "ONDE",
|
|
5
|
+
"where": {
|
|
6
|
+
"v1": {
|
|
7
|
+
"dsl_type": "field",
|
|
8
|
+
"dsl_value": "Responsavel"
|
|
9
|
+
},
|
|
10
|
+
"v2": {
|
|
11
|
+
"dsl_type": "value",
|
|
12
|
+
"dsl_value": "raphael"
|
|
13
|
+
},
|
|
14
|
+
"operator": "iContains"
|
|
15
|
+
}
|
|
16
|
+
},
|
|
17
|
+
{
|
|
18
|
+
"mode": "ONDE",
|
|
19
|
+
"where": {
|
|
20
|
+
"v1": {
|
|
21
|
+
"dsl_type": "field",
|
|
22
|
+
"dsl_value": "Responsavel"
|
|
23
|
+
},
|
|
24
|
+
"v2": {
|
|
25
|
+
"dsl_type": "value",
|
|
26
|
+
"dsl_value": "raphael"
|
|
27
|
+
},
|
|
28
|
+
"operator": "iContains"
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
]
|