@puca/puca-core 12.14.0 → 13.1.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.
Files changed (196) hide show
  1. package/dist/core/services/abstract-controller.d.ts +2 -1
  2. package/dist/core/services/abstract-controller.js +11 -1
  3. package/dist/core/services/abstract-controller.js.map +1 -1
  4. package/dist/core/services/auth.service.d.ts +15 -1
  5. package/dist/core/services/auth.service.js +7 -6
  6. package/dist/core/services/auth.service.js.map +1 -1
  7. package/dist/core/services/comunication/comunication-http.service.d.ts +1 -1
  8. package/dist/core/services/comunication/comunication-http.service.js +2 -2
  9. package/dist/core/services/comunication/comunication-http.service.js.map +1 -1
  10. package/dist/core/services/comunication/comunication.service.d.ts +1 -1
  11. package/dist/core/services/comunication/comunication.service.js +2 -2
  12. package/dist/core/services/comunication/comunication.service.js.map +1 -1
  13. package/dist/core/services/crud-base-testable.service.d.ts +2 -2
  14. package/dist/core/services/crud-base-testable.service.js +8 -4
  15. package/dist/core/services/crud-base-testable.service.js.map +1 -1
  16. package/dist/core/services/crud-base.service.d.ts +1 -1
  17. package/dist/core/services/crud-base.service.js +2 -2
  18. package/dist/core/services/crud-base.service.js.map +1 -1
  19. package/dist/core/services/crud-front-base.service.d.ts +2 -4
  20. package/dist/core/services/crud-front-base.service.js +6 -7
  21. package/dist/core/services/crud-front-base.service.js.map +1 -1
  22. package/dist/core/services/domain-life-cycle.service.d.ts +3 -1
  23. package/dist/core/services/domain-life-cycle.service.js +5 -2
  24. package/dist/core/services/domain-life-cycle.service.js.map +1 -1
  25. package/dist/core/services/email.service.d.ts +1 -1
  26. package/dist/core/services/email.service.js +2 -2
  27. package/dist/core/services/email.service.js.map +1 -1
  28. package/dist/core/services/followers.service.d.ts +1 -1
  29. package/dist/core/services/followers.service.js +2 -2
  30. package/dist/core/services/followers.service.js.map +1 -1
  31. package/dist/core/services/incremental-search.service.js +1 -1
  32. package/dist/core/services/incremental-search.service.js.map +1 -1
  33. package/dist/core/services/index.js +21 -25
  34. package/dist/core/services/index.js.map +1 -1
  35. package/dist/core/services/install.service.d.ts +2 -1
  36. package/dist/core/services/install.service.js +5 -3
  37. package/dist/core/services/install.service.js.map +1 -1
  38. package/dist/core/services/job/job.client.d.ts +3 -2
  39. package/dist/core/services/job/job.client.js +5 -4
  40. package/dist/core/services/job/job.client.js.map +1 -1
  41. package/dist/core/services/job-executor/job-executor.service.js +1 -1
  42. package/dist/core/services/job-executor/job-executor.service.js.map +1 -1
  43. package/dist/core/services/llm/llm.service.d.ts +28 -15
  44. package/dist/core/services/llm/llm.service.js +146 -78
  45. package/dist/core/services/llm/llm.service.js.map +1 -1
  46. package/dist/core/services/llm/token-budget.service.d.ts +8 -3
  47. package/dist/core/services/llm/token-budget.service.js +59 -25
  48. package/dist/core/services/llm/token-budget.service.js.map +1 -1
  49. package/dist/core/services/logger.d.ts +9 -7
  50. package/dist/core/services/logger.js +38 -14
  51. package/dist/core/services/logger.js.map +1 -1
  52. package/dist/core/services/mcp/mcp-server.service.d.ts +16 -1
  53. package/dist/core/services/mcp/mcp-server.service.js +17 -9
  54. package/dist/core/services/mcp/mcp-server.service.js.map +1 -1
  55. package/dist/core/services/migration/migration.service.d.ts +5 -1
  56. package/dist/core/services/migration/migration.service.js +11 -9
  57. package/dist/core/services/migration/migration.service.js.map +1 -1
  58. package/dist/core/services/monitor.d.ts +7 -4
  59. package/dist/core/services/monitor.js +30 -6
  60. package/dist/core/services/monitor.js.map +1 -1
  61. package/dist/core/services/mq/mq.service.d.ts +6 -10
  62. package/dist/core/services/mq/mq.service.js +167 -20
  63. package/dist/core/services/mq/mq.service.js.map +1 -1
  64. package/dist/core/services/notification.service.d.ts +1 -1
  65. package/dist/core/services/notification.service.js +2 -2
  66. package/dist/core/services/notification.service.js.map +1 -1
  67. package/dist/core/services/plugin.service.d.ts +1 -3
  68. package/dist/core/services/plugin.service.js +2 -3
  69. package/dist/core/services/plugin.service.js.map +1 -1
  70. package/dist/core/services/report.service.d.ts +24 -1
  71. package/dist/core/services/report.service.js +20 -6
  72. package/dist/core/services/report.service.js.map +1 -1
  73. package/dist/core/services/server-life-cycle.service.js +1 -12
  74. package/dist/core/services/server-life-cycle.service.js.map +1 -1
  75. package/dist/core/services/storage/storage.service.d.ts +2 -1
  76. package/dist/core/services/storage/storage.service.js +3 -2
  77. package/dist/core/services/storage/storage.service.js.map +1 -1
  78. package/dist/core/services/system-parameters-envs.service.d.ts +2 -1
  79. package/dist/core/services/system-parameters-envs.service.js +3 -2
  80. package/dist/core/services/system-parameters-envs.service.js.map +1 -1
  81. package/dist/core/services/task.service.d.ts +2 -0
  82. package/dist/core/services/task.service.js.map +1 -1
  83. package/dist/core/services/user.service.d.ts +2 -1
  84. package/dist/core/services/user.service.js +3 -2
  85. package/dist/core/services/user.service.js.map +1 -1
  86. package/dist/core/services/web-socket.service.js +1 -1
  87. package/dist/core/services/web-socket.service.js.map +1 -1
  88. package/dist/essential/config.service.d.ts +2 -1
  89. package/dist/essential/config.service.js +3 -2
  90. package/dist/essential/config.service.js.map +1 -1
  91. package/dist/essential/index.js +1 -1
  92. package/dist/essential/index.js.map +1 -1
  93. package/dist/essential/module-config.service.js +3 -3
  94. package/dist/essential/module-config.service.js.map +1 -1
  95. package/dist/models/crud-controller-especification-environment.d.ts +11 -3
  96. package/dist/models/crud-controller-especification-environment.js.map +1 -1
  97. package/dist/models/crud-controller-especification.d.ts +1 -1
  98. package/dist/orm/cases/bo/sql.service.d.ts +2 -2
  99. package/dist/orm/cases/bo/sql.service.js +3 -3
  100. package/dist/orm/cases/bo/sql.service.js.map +1 -1
  101. package/dist/orm/cases/index.d.ts +6 -5
  102. package/dist/orm/cases/index.js +7 -6
  103. package/dist/orm/cases/index.js.map +1 -1
  104. package/dist/orm/cases/vanilla/sql-builder/mutation.service.d.ts +2 -1
  105. package/dist/orm/cases/vanilla/sql-builder/mutation.service.js +3 -2
  106. package/dist/orm/cases/vanilla/sql-builder/mutation.service.js.map +1 -1
  107. package/dist/orm/cases/vanilla/sql-builder/select.service.d.ts +2 -0
  108. package/dist/orm/cases/vanilla/sql-builder/select.service.js +23 -20
  109. package/dist/orm/cases/vanilla/sql-builder/select.service.js.map +1 -1
  110. package/dist/orm/services/cache-repository/cache-repository-redis.d.ts +2 -1
  111. package/dist/orm/services/cache-repository/cache-repository-redis.js +3 -2
  112. package/dist/orm/services/cache-repository/cache-repository-redis.js.map +1 -1
  113. package/dist/orm/services/cache-repository/cache-repository.d.ts +2 -1
  114. package/dist/orm/services/cache-repository/cache-repository.js +3 -2
  115. package/dist/orm/services/cache-repository/cache-repository.js.map +1 -1
  116. package/dist/orm/services/cache.service.d.ts +4 -2
  117. package/dist/orm/services/cache.service.js +6 -4
  118. package/dist/orm/services/cache.service.js.map +1 -1
  119. package/dist/orm/services/index.js +5 -5
  120. package/dist/orm/services/index.js.map +1 -1
  121. package/dist/orm/services/managers/database-manager.service.d.ts +4 -2
  122. package/dist/orm/services/managers/database-manager.service.js +9 -7
  123. package/dist/orm/services/managers/database-manager.service.js.map +1 -1
  124. package/dist/orm/services/managers/puca-orm-client.service.d.ts +1 -1
  125. package/dist/orm/services/managers/puca-orm-client.service.js +2 -2
  126. package/dist/orm/services/managers/puca-orm-client.service.js.map +1 -1
  127. package/dist/orm/services/repository-factory.d.ts +2 -1
  128. package/dist/orm/services/repository-factory.js +5 -4
  129. package/dist/orm/services/repository-factory.js.map +1 -1
  130. package/dist/orm/services/repository.d.ts +2 -1
  131. package/dist/orm/services/repository.js +3 -2
  132. package/dist/orm/services/repository.js.map +1 -1
  133. package/dist/orm/services/sql/sql-layer.service.d.ts +2 -1
  134. package/dist/orm/services/sql/sql-layer.service.js +3 -2
  135. package/dist/orm/services/sql/sql-layer.service.js.map +1 -1
  136. package/dist/orm/services/sql/sql-security-layer.service.d.ts +2 -3
  137. package/dist/orm/services/sql/sql-security-layer.service.js +4 -4
  138. package/dist/orm/services/sql/sql-security-layer.service.js.map +1 -1
  139. package/dist/orm/services/sql/sql.service.d.ts +2 -1
  140. package/dist/orm/services/sql/sql.service.js +3 -2
  141. package/dist/orm/services/sql/sql.service.js.map +1 -1
  142. package/dist/orm/services/sql-executor.d.ts +2 -1
  143. package/dist/orm/services/sql-executor.js +7 -5
  144. package/dist/orm/services/sql-executor.js.map +1 -1
  145. package/dist/orm/services/transaction.d.ts +4 -2
  146. package/dist/orm/services/transaction.js +11 -7
  147. package/dist/orm/services/transaction.js.map +1 -1
  148. package/dist/packages/crm/crm.service.d.ts +2 -1
  149. package/dist/packages/crm/crm.service.js +8 -3
  150. package/dist/packages/crm/crm.service.js.map +1 -1
  151. package/dist/packages/index.js +2 -2
  152. package/dist/packages/index.js.map +1 -1
  153. package/dist/packages/tax/tax.service.d.ts +2 -1
  154. package/dist/packages/tax/tax.service.js +3 -2
  155. package/dist/packages/tax/tax.service.js.map +1 -1
  156. package/dist/plugins/file-system/file-system.service.d.ts +1 -1
  157. package/dist/plugins/file-system/file-system.service.js +1 -1
  158. package/dist/plugins/file-system/file-system.service.js.map +1 -1
  159. package/dist/plugins/file-system/shared-file-system.service.d.ts +1 -0
  160. package/dist/plugins/file-system/shared-file-system.service.js +1 -1
  161. package/dist/plugins/file-system/shared-file-system.service.js.map +1 -1
  162. package/dist/plugins/final-user-query-language/final-user-query-language.js +5 -5
  163. package/dist/plugins/final-user-query-language/final-user-query-language.js.map +1 -1
  164. package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.d.ts +3 -0
  165. package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.js +13 -6
  166. package/dist/plugins/final-user-query-language/fuql-2-pql-conversor.js.map +1 -1
  167. package/dist/plugins/grpc-client.service.d.ts +2 -1
  168. package/dist/plugins/grpc-client.service.js +3 -2
  169. package/dist/plugins/grpc-client.service.js.map +1 -1
  170. package/dist/plugins/multi-tenant/puca-hub.service.js +1 -1
  171. package/dist/plugins/multi-tenant/puca-hub.service.js.map +1 -1
  172. package/dist/plugins/nestjs/puca-auth.decorators.js +3 -0
  173. package/dist/plugins/nestjs/puca-auth.decorators.js.map +1 -1
  174. package/dist/plugins/nestjs/puca-auth.guard.js +1 -1
  175. package/dist/plugins/nestjs/puca-auth.guard.js.map +1 -1
  176. package/dist/tsconfig.tsbuildinfo +1 -1
  177. package/fuql-grammar.js +139 -32
  178. package/fuql-grammar.ne +128 -22
  179. package/fuql-snapshot/COMAC_MATERIAL_DE_CONSTRUCAO_L_ONDE__Cliente____Chave__nica_____43767__E__Nota_Fiscal____Data______02_06_2025_.json +55 -0
  180. package/fuql-snapshot/ONDE_N_O_f4___v5_E_f5___v6.json +39 -0
  181. package/fuql-snapshot/ONDE_Responsavel_CONTEM_raphael.json +17 -0
  182. package/fuql-snapshot/ONDE_Responsavel__CONTEM_raphael.json +31 -0
  183. package/fuql-snapshot/ONDE__123_____123_.json +19 -0
  184. package/fuql-snapshot/ONDE__Etapa____Nome____teste.json +17 -0
  185. package/fuql-snapshot/ONDE__N_O_f4___v5_E_f5___v6_.json +43 -0
  186. package/fuql-snapshot/ONDE___idade___18__E__nome____Raphael__OU_nome____Carvalho__.json +104 -0
  187. package/fuql-snapshot/ONDE__nome_____sobrenome_.json +19 -0
  188. package/fuql-snapshot/ONDE_data___01_01_2023.json +16 -0
  189. package/fuql-snapshot/ONDE_nome___1_000_00.json +16 -0
  190. package/fuql-snapshot/ONDE_nome___Raphael_Carvalho_de_Aguiar.json +16 -0
  191. package/fuql-snapshot/ONDE_nome____.json +16 -0
  192. package/fuql-snapshot/ONDE_nome_____Raphael__E_N_O_sobrenome____Carvalho_.json +46 -0
  193. package/fuql-snapshot/ONDE_responsavel___puca_user.json +16 -0
  194. package/fuql-snapshot/a223.json +6 -0
  195. package/fuql-snapshot/bom_dia_ONDE_nome____Raphael_Carvalho_de_Aguiar_.json +18 -0
  196. package/package.json +1 -1
package/fuql-grammar.js CHANGED
@@ -2,10 +2,40 @@
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 => {
36
+ if(!d[0]) {
37
+ return null
38
+ }
9
39
  return {
10
40
  mode: 'ONDE',
11
41
  ...d[0]
@@ -13,6 +43,9 @@ var grammar = {
13
43
  }
14
44
  },
15
45
  {"name": "main", "symbols": ["query", "_", "ONDE"], "postprocess": d => {
46
+ if(!d[2]) {
47
+ return null
48
+ }
16
49
  return {
17
50
  mode: 'query _ ONDE',
18
51
  ...d[0],
@@ -33,6 +66,9 @@ var grammar = {
33
66
  },
34
67
  {"name": "ONDE$string$1", "symbols": [{"literal":"O"}, {"literal":"N"}, {"literal":"D"}, {"literal":"E"}], "postprocess": function joiner(d) {return d.join('');}},
35
68
  {"name": "ONDE", "symbols": ["ONDE$string$1", "_", "expr"], "postprocess": d => {
69
+ if(!d[2]) {
70
+ return null
71
+ }
36
72
  return {
37
73
  where: d[2]
38
74
  }
@@ -56,6 +92,24 @@ var grammar = {
56
92
  {"name": "expr$subexpression$2", "symbols": ["q_value"]},
57
93
  {"name": "expr$subexpression$2", "symbols": ["q_field"]},
58
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
+
59
113
  const operatorStr = {
60
114
  ['=']: 'equals',
61
115
  ['<']: 'less',
@@ -77,6 +131,9 @@ var grammar = {
77
131
  }
78
132
  },
79
133
  {"name": "expr", "symbols": ["expr", "_", {"literal":"E"}, "_", "expr"], "postprocess": d => {
134
+ if(!d[0] || !d[4]) {
135
+ return null
136
+ }
80
137
  return {
81
138
  and: [
82
139
  d[0],
@@ -87,6 +144,9 @@ var grammar = {
87
144
  },
88
145
  {"name": "expr$string$1", "symbols": [{"literal":"O"}, {"literal":"U"}], "postprocess": function joiner(d) {return d.join('');}},
89
146
  {"name": "expr", "symbols": ["expr", "_", "expr$string$1", "_", "expr"], "postprocess": d => {
147
+ if(!d[0] || !d[4]) {
148
+ return null
149
+ }
90
150
  return {
91
151
  or: [
92
152
  d[0],
@@ -97,6 +157,10 @@ var grammar = {
97
157
  },
98
158
  {"name": "expr$string$2", "symbols": [{"literal":"É"}, {"literal":"N"}, {"literal":"U"}, {"literal":"L"}, {"literal":"O"}], "postprocess": function joiner(d) {return d.join('');}},
99
159
  {"name": "expr", "symbols": ["field", "_", "expr$string$2"], "postprocess": d => {
160
+ const result = d[0]
161
+ if(!result) {
162
+ return null
163
+ }
100
164
  return {
101
165
  v1: d[0],
102
166
  operator: 'isNull'
@@ -105,28 +169,51 @@ var grammar = {
105
169
  },
106
170
  {"name": "expr$string$3", "symbols": [{"literal":"N"}, {"literal":"Ã"}, {"literal":"O"}], "postprocess": function joiner(d) {return d.join('');}},
107
171
  {"name": "expr", "symbols": ["expr$string$3", "_", "expr"], "postprocess": d => {
172
+ const result = d[2]
173
+ if(!result) {
174
+ return null
175
+ }
176
+
177
+ if(result.and && !result.parenthesis) {
178
+ return null
179
+ }
180
+
181
+ if(result.or && !result.parenthesis) {
182
+ return null
183
+ }
184
+
108
185
  return {
109
- not: d[2]
186
+ not: result
110
187
  }
111
188
  }
112
189
  },
113
190
  {"name": "expr", "symbols": [{"literal":"("}, "expr", {"literal":")"}], "postprocess": d => {
114
- return d[1]
191
+ const result = d[1]
192
+ if(!result) {
193
+ return null
194
+ }
195
+
196
+ return {
197
+ parenthesis: true,
198
+ ...result,
199
+ }
115
200
  }
116
201
  },
202
+ {"name": "operator$string$1", "symbols": [{"literal":"!"}, {"literal":"="}], "postprocess": function joiner(d) {return d.join('');}},
203
+ {"name": "operator", "symbols": ["operator$string$1"]},
117
204
  {"name": "operator", "symbols": [{"literal":"="}]},
118
205
  {"name": "operator", "symbols": [{"literal":"<"}]},
119
206
  {"name": "operator", "symbols": [{"literal":">"}]},
120
- {"name": "operator$string$1", "symbols": [{"literal":"<"}, {"literal":"="}], "postprocess": function joiner(d) {return d.join('');}},
121
- {"name": "operator", "symbols": ["operator$string$1"]},
122
- {"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('');}},
123
208
  {"name": "operator", "symbols": ["operator$string$2"]},
124
- {"name": "operator", "symbols": [{"literal":"~"}]},
125
- {"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('');}},
126
210
  {"name": "operator", "symbols": ["operator$string$3"]},
127
- {"name": "operator$string$4", "symbols": [{"literal":"I"}, {"literal":"N"}, {"literal":"I"}, {"literal":"C"}, {"literal":"I"}, {"literal":"A"}], "postprocess": function joiner(d) {return d.join('');}},
128
- {"name": "operator$string$5", "symbols": [{"literal":"C"}, {"literal":"O"}, {"literal":"M"}], "postprocess": function joiner(d) {return d.join('');}},
129
- {"name": "operator", "symbols": ["operator$string$4", "_", "operator$string$5"], "postprocess": d => {
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 => {
130
217
  const result = d
131
218
  .filter(d => d)
132
219
  .join(' ')
@@ -134,9 +221,9 @@ var grammar = {
134
221
  return result
135
222
  }
136
223
  },
137
- {"name": "operator$string$6", "symbols": [{"literal":"T"}, {"literal":"E"}, {"literal":"R"}, {"literal":"M"}, {"literal":"I"}, {"literal":"N"}, {"literal":"A"}], "postprocess": function joiner(d) {return d.join('');}},
138
- {"name": "operator$string$7", "symbols": [{"literal":"C"}, {"literal":"O"}, {"literal":"M"}], "postprocess": function joiner(d) {return d.join('');}},
139
- {"name": "operator", "symbols": ["operator$string$6", "_", "operator$string$7"], "postprocess": d => {
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 => {
140
227
  const result = d
141
228
  .filter(d => d)
142
229
  .join(' ')
@@ -146,25 +233,60 @@ var grammar = {
146
233
  },
147
234
  {"name": "operator", "symbols": [{"literal":"É"}]},
148
235
  {"name": "q_field", "symbols": [{"literal":"\""}, "freeText", {"literal":"\""}], "postprocess": d => {
236
+ let result = d[1]
237
+ if(!result) {
238
+ return null
239
+ }
240
+
241
+ if(result.includes('"')) {
242
+ return null
243
+ }
244
+
149
245
  return {
150
246
  dsl_type: 'field',
151
- dsl_value: d[1]
247
+ dsl_value: result
152
248
  }
153
249
  } },
154
250
  {"name": "field", "symbols": ["freeText"], "postprocess": d => {
251
+ const result = d[0]
252
+ if(!result) {
253
+ return null
254
+ }
255
+
256
+ if(hasReservedKeyWords(result)) {
257
+ return null
258
+ }
259
+
155
260
  return {
156
261
  dsl_type: 'field',
157
- dsl_value: d[0]
262
+ dsl_value: result
158
263
  }
159
264
  } },
160
265
  {"name": "q_value", "symbols": [{"literal":"'"}, "freeText", {"literal":"'"}], "postprocess": d => {
266
+ let result = d[1]
267
+ if(!result) {
268
+ return null
269
+ }
270
+
271
+ if(result.includes("'")) {
272
+ return null
273
+ }
274
+
161
275
  return {
162
276
  dsl_type: 'value',
163
- dsl_value: d[1]
277
+ dsl_value: result
164
278
  }
165
279
  } },
166
280
  {"name": "value", "symbols": ["freeText"], "postprocess": d => {
167
281
  const result = d[0]
282
+ if(!result) {
283
+ return null
284
+ }
285
+
286
+ if(hasReservedKeyWords(result)) {
287
+ return null
288
+ }
289
+
168
290
  return {
169
291
  dsl_type: 'value',
170
292
  dsl_value: result
@@ -173,22 +295,7 @@ var grammar = {
173
295
  {"name": "freeText$ebnf$1", "symbols": [/./]},
174
296
  {"name": "freeText$ebnf$1", "symbols": ["freeText$ebnf$1", /./], "postprocess": function arrpush(d) {return d[0].concat([d[1]]);}},
175
297
  {"name": "freeText", "symbols": ["freeText$ebnf$1"], "postprocess": d => {
176
- const oResult = (d[0] || []).join('').trim()
177
- let result = oResult
178
-
179
- const removeChar = (sChar, eChar) => {
180
- if(result.startsWith(sChar)) {
181
- result = result.slice(1)
182
- }
183
-
184
- if(result.endsWith(eChar)) {
185
- result = result.slice(0, -1)
186
- }
187
- }
188
-
189
- removeChar('(', ')')
190
- removeChar("'", "'")
191
-
298
+ const result = (d[0] || []).join('').trim()
192
299
  return result
193
300
  } },
194
301
  {"name": "ident$ebnf$1", "symbols": [/[a-zA-z0-9À-ÖØ-öø-ÿ]/]},
package/fuql-grammar.ne CHANGED
@@ -1,10 +1,44 @@
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 => {
30
+ if(!d[0]) {
31
+ return null
32
+ }
2
33
  return {
3
34
  mode: 'ONDE',
4
35
  ...d[0]
5
36
  }
6
37
  }
7
38
  %} | query _ ONDE {% d => {
39
+ if(!d[2]) {
40
+ return null
41
+ }
8
42
  return {
9
43
  mode: 'query _ ONDE',
10
44
  ...d[0],
@@ -24,6 +58,9 @@ main -> ONDE {% d => {
24
58
  %}
25
59
 
26
60
  ONDE -> "ONDE" _ expr {% d => {
61
+ if(!d[2]) {
62
+ return null
63
+ }
27
64
  return {
28
65
  where: d[2]
29
66
  }
@@ -41,6 +78,24 @@ query -> [a-zA-Z0-9 ]:+ {% d => {
41
78
  }%}
42
79
 
43
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
+
44
99
  const operatorStr = {
45
100
  ['=']: 'equals',
46
101
  ['<']: 'less',
@@ -61,6 +116,9 @@ expr -> (field | q_field | q_value) _ operator _ (value | q_value | q_field) {%
61
116
  }
62
117
  }
63
118
  %} | expr _ "E" _ expr {% d => {
119
+ if(!d[0] || !d[4]) {
120
+ return null
121
+ }
64
122
  return {
65
123
  and: [
66
124
  d[0],
@@ -69,6 +127,9 @@ expr -> (field | q_field | q_value) _ operator _ (value | q_value | q_field) {%
69
127
  }
70
128
  }
71
129
  %} | expr _ "OU" _ expr {% d => {
130
+ if(!d[0] || !d[4]) {
131
+ return null
132
+ }
72
133
  return {
73
134
  or: [
74
135
  d[0],
@@ -77,22 +138,47 @@ expr -> (field | q_field | q_value) _ operator _ (value | q_value | q_field) {%
77
138
  }
78
139
  }
79
140
  %} | field _ "ÉNULO" {% d => {
141
+ const result = d[0]
142
+ if(!result) {
143
+ return null
144
+ }
80
145
  return {
81
146
  v1: d[0],
82
147
  operator: 'isNull'
83
148
  }
84
149
  }
85
150
  %} | "NÃO" _ expr {% d => {
151
+ const result = d[2]
152
+ if(!result) {
153
+ return null
154
+ }
155
+
156
+ if(result.and && !result.parenthesis) {
157
+ return null
158
+ }
159
+
160
+ if(result.or && !result.parenthesis) {
161
+ return null
162
+ }
163
+
86
164
  return {
87
- not: d[2]
165
+ not: result
88
166
  }
89
167
  }
90
168
  %} | "(" expr ")" {% d => {
91
- return d[1]
169
+ const result = d[1]
170
+ if(!result) {
171
+ return null
172
+ }
173
+
174
+ return {
175
+ parenthesis: true,
176
+ ...result,
177
+ }
92
178
  }
93
179
  %}
94
180
 
95
- operator -> "=" | "<" | ">" | "<=" | ">=" | "~" | "CONTEM" | "INICIA" _ "COM" {% d => {
181
+ operator -> "!=" | "=" | "<" | ">" | "<=" | ">=" | "~" | "CONTEM" | "INICIA" _ "COM" {% d => {
96
182
  const result = d
97
183
  .filter(d => d)
98
184
  .join(' ')
@@ -109,25 +195,60 @@ operator -> "=" | "<" | ">" | "<=" | ">=" | "~" | "CONTEM" | "INICIA" _ "COM" {%
109
195
  %} | "É"
110
196
 
111
197
  q_field -> "\"" freeText "\"" {% d => {
198
+ let result = d[1]
199
+ if(!result) {
200
+ return null
201
+ }
202
+
203
+ if(result.includes('"')) {
204
+ return null
205
+ }
206
+
112
207
  return {
113
208
  dsl_type: 'field',
114
- dsl_value: d[1]
209
+ dsl_value: result
115
210
  }
116
211
  } %}
117
212
  field -> freeText {% d => {
213
+ const result = d[0]
214
+ if(!result) {
215
+ return null
216
+ }
217
+
218
+ if(hasReservedKeyWords(result)) {
219
+ return null
220
+ }
221
+
118
222
  return {
119
223
  dsl_type: 'field',
120
- dsl_value: d[0]
224
+ dsl_value: result
121
225
  }
122
226
  } %}
123
227
  q_value -> "'" freeText "'" {% d => {
228
+ let result = d[1]
229
+ if(!result) {
230
+ return null
231
+ }
232
+
233
+ if(result.includes("'")) {
234
+ return null
235
+ }
236
+
124
237
  return {
125
238
  dsl_type: 'value',
126
- dsl_value: d[1]
239
+ dsl_value: result
127
240
  }
128
241
  } %}
129
242
  value -> freeText {% d => {
130
243
  const result = d[0]
244
+ if(!result) {
245
+ return null
246
+ }
247
+
248
+ if(hasReservedKeyWords(result)) {
249
+ return null
250
+ }
251
+
131
252
  return {
132
253
  dsl_type: 'value',
133
254
  dsl_value: result
@@ -135,22 +256,7 @@ value -> freeText {% d => {
135
256
  } %}
136
257
 
137
258
  freeText -> .:+ {% d => {
138
- const oResult = (d[0] || []).join('').trim()
139
- let result = oResult
140
-
141
- const removeChar = (sChar, eChar) => {
142
- if(result.startsWith(sChar)) {
143
- result = result.slice(1)
144
- }
145
-
146
- if(result.endsWith(eChar)) {
147
- result = result.slice(0, -1)
148
- }
149
- }
150
-
151
- removeChar('(', ')')
152
- removeChar("'", "'")
153
-
259
+ const result = (d[0] || []).join('').trim()
154
260
  return result
155
261
  } %}
156
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,17 @@
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
+ ]
@@ -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
+ ]
@@ -0,0 +1,19 @@
1
+ [
2
+ {
3
+ "mode": "ONDE",
4
+ "where": {
5
+ "v1": {
6
+ "dsl_type": "value",
7
+ "dsl_value": "123"
8
+ },
9
+ "v2": {
10
+ "dsl_type": "value",
11
+ "dsl_value": "123"
12
+ },
13
+ "operator": "equals"
14
+ }
15
+ },
16
+ null,
17
+ null,
18
+ null
19
+ ]
@@ -0,0 +1,17 @@
1
+ [
2
+ {
3
+ "mode": "ONDE",
4
+ "where": {
5
+ "v1": {
6
+ "dsl_type": "field",
7
+ "dsl_value": "Etapa -> Nome"
8
+ },
9
+ "v2": {
10
+ "dsl_type": "value",
11
+ "dsl_value": "teste"
12
+ },
13
+ "operator": "equals"
14
+ }
15
+ },
16
+ null
17
+ ]