@opengis/fastify-table 2.5.43 → 2.5.46

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 (89) hide show
  1. package/dist/functions.d.ts +1 -0
  2. package/dist/functions.d.ts.map +1 -1
  3. package/dist/functions.js +122 -1
  4. package/dist/helper.d.ts +20 -0
  5. package/dist/helper.d.ts.map +1 -1
  6. package/dist/helper.js +26 -0
  7. package/dist/index.d.ts.map +1 -1
  8. package/dist/index.js +5 -2
  9. package/dist/server/migrations/dictionaries.sql +79 -0
  10. package/dist/server/plugins/access/funcs/getResources.d.ts +2 -1
  11. package/dist/server/plugins/access/funcs/getResources.d.ts.map +1 -1
  12. package/dist/server/plugins/access/funcs/getResources.js +5 -1
  13. package/dist/server/plugins/crud/funcs/dataDelete.d.ts +2 -1
  14. package/dist/server/plugins/crud/funcs/dataDelete.d.ts.map +1 -1
  15. package/dist/server/plugins/crud/funcs/dataDelete.js +2 -2
  16. package/dist/server/plugins/crud/funcs/getOpt.d.ts +1 -1
  17. package/dist/server/plugins/crud/funcs/getOpt.d.ts.map +1 -1
  18. package/dist/server/plugins/crud/funcs/getOpt.js +1 -1
  19. package/dist/server/plugins/crud/funcs/setOpt.d.ts +1 -1
  20. package/dist/server/plugins/crud/funcs/setOpt.d.ts.map +1 -1
  21. package/dist/server/plugins/crud/funcs/setOpt.js +1 -1
  22. package/dist/server/plugins/crud/funcs/setToken.d.ts +1 -1
  23. package/dist/server/plugins/crud/funcs/setToken.d.ts.map +1 -1
  24. package/dist/server/plugins/table/funcs/getData.d.ts +32 -0
  25. package/dist/server/plugins/table/funcs/getData.d.ts.map +1 -0
  26. package/dist/server/plugins/table/funcs/getData.js +703 -0
  27. package/dist/server/plugins/table/funcs/getFilterSQLParametrized/index.d.ts +2 -1
  28. package/dist/server/plugins/table/funcs/getFilterSQLParametrized/index.d.ts.map +1 -1
  29. package/dist/server/plugins/table/funcs/getFilterSQLParametrized/index.js +2 -2
  30. package/dist/server/routes/crud/controllers/insert.d.ts +1 -2
  31. package/dist/server/routes/crud/controllers/insert.d.ts.map +1 -1
  32. package/dist/server/routes/crud/controllers/insert.js +1 -1
  33. package/dist/server/routes/crud/controllers/table.d.ts +1 -2
  34. package/dist/server/routes/crud/controllers/table.d.ts.map +1 -1
  35. package/dist/server/routes/crud/controllers/table.js +1 -1
  36. package/dist/server/routes/crud/controllers/update.js +1 -1
  37. package/dist/server/routes/crud/crud.route.d.ts +3 -0
  38. package/dist/server/routes/crud/crud.route.d.ts.map +1 -0
  39. package/dist/server/routes/crud/crud.route.js +161 -0
  40. package/dist/server/routes/crud/crud.schema.d.ts +114 -0
  41. package/dist/server/routes/crud/crud.schema.d.ts.map +1 -0
  42. package/dist/server/routes/crud/crud.schema.js +64 -0
  43. package/dist/server/routes/crud/functions/createTableRelation.d.ts +13 -0
  44. package/dist/server/routes/crud/functions/createTableRelation.d.ts.map +1 -0
  45. package/dist/server/routes/crud/functions/createTableRelation.js +93 -0
  46. package/dist/server/routes/crud/functions/deleteTableRelation.d.ts +11 -0
  47. package/dist/server/routes/crud/functions/deleteTableRelation.d.ts.map +1 -0
  48. package/dist/server/routes/crud/functions/deleteTableRelation.js +74 -0
  49. package/dist/server/routes/crud/functions/readTableRelations.d.ts +25 -0
  50. package/dist/server/routes/crud/functions/readTableRelations.d.ts.map +1 -0
  51. package/dist/server/routes/crud/functions/readTableRelations.js +76 -0
  52. package/dist/server/routes/crud/functions/updateTableRelation.d.ts +14 -0
  53. package/dist/server/routes/crud/functions/updateTableRelation.d.ts.map +1 -0
  54. package/dist/server/routes/crud/functions/updateTableRelation.js +117 -0
  55. package/dist/server/routes/dictionaries/dictionaries.route.d.ts +2 -0
  56. package/dist/server/routes/dictionaries/dictionaries.route.d.ts.map +1 -0
  57. package/dist/server/routes/dictionaries/dictionaries.route.js +134 -0
  58. package/dist/server/routes/dictionaries/dictionaries.schema.d.ts +190 -0
  59. package/dist/server/routes/dictionaries/dictionaries.schema.d.ts.map +1 -0
  60. package/dist/server/routes/dictionaries/dictionaries.schema.js +86 -0
  61. package/dist/server/routes/dictionaries/functions/create.dictionary.d.ts +10 -0
  62. package/dist/server/routes/dictionaries/functions/create.dictionary.d.ts.map +1 -0
  63. package/dist/server/routes/dictionaries/functions/create.dictionary.item.d.ts +13 -0
  64. package/dist/server/routes/dictionaries/functions/create.dictionary.item.d.ts.map +1 -0
  65. package/dist/server/routes/dictionaries/functions/create.dictionary.item.js +57 -0
  66. package/dist/server/routes/dictionaries/functions/create.dictionary.js +76 -0
  67. package/dist/server/routes/dictionaries/functions/delete.dictionary.d.ts +9 -0
  68. package/dist/server/routes/dictionaries/functions/delete.dictionary.d.ts.map +1 -0
  69. package/dist/server/routes/dictionaries/functions/delete.dictionary.item.d.ts +11 -0
  70. package/dist/server/routes/dictionaries/functions/delete.dictionary.item.d.ts.map +1 -0
  71. package/dist/server/routes/dictionaries/functions/delete.dictionary.item.js +32 -0
  72. package/dist/server/routes/dictionaries/functions/delete.dictionary.js +28 -0
  73. package/dist/server/routes/dictionaries/functions/read.dictionaries.d.ts +5 -0
  74. package/dist/server/routes/dictionaries/functions/read.dictionaries.d.ts.map +1 -0
  75. package/dist/server/routes/dictionaries/functions/read.dictionaries.js +27 -0
  76. package/dist/server/routes/dictionaries/functions/update.dictionary.d.ts +10 -0
  77. package/dist/server/routes/dictionaries/functions/update.dictionary.d.ts.map +1 -0
  78. package/dist/server/routes/dictionaries/functions/update.dictionary.item.d.ts +13 -0
  79. package/dist/server/routes/dictionaries/functions/update.dictionary.item.d.ts.map +1 -0
  80. package/dist/server/routes/dictionaries/functions/update.dictionary.item.js +48 -0
  81. package/dist/server/routes/dictionaries/functions/update.dictionary.js +51 -0
  82. package/dist/server/routes/file/schema.js +6 -6
  83. package/dist/server/routes/table/functions/getData.d.ts +3 -2
  84. package/dist/server/routes/table/functions/getData.d.ts.map +1 -1
  85. package/dist/server/routes/table/functions/getData.js +2 -14
  86. package/dist/server/routes/table/schema.d.ts +5 -4
  87. package/dist/server/routes/table/schema.d.ts.map +1 -1
  88. package/dist/server/routes/table/schema.js +13 -13
  89. package/package.json +1 -1
@@ -1,5 +1,6 @@
1
1
  export declare function onListen1(): Promise<void>;
2
2
  export declare function onListen2(): Promise<void>;
3
+ export declare function onListen3(): Promise<void>;
3
4
  export declare function preTemplate({ name, type, user, }: {
4
5
  name?: string;
5
6
  type?: string;
@@ -1 +1 @@
1
- {"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../functions.ts"],"names":[],"mappings":"AAgCA,wBAAsB,SAAS,kBAkH9B;AAED,wBAAsB,SAAS,kBAiJ9B;AAED,wBAAsB,WAAW,CAAC,EAChC,IAAI,EACJ,IAAI,EACJ,IAAS,GACV,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B;;eAqBA;AAED,wBAAsB,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,GAAG,CAAA;CAAE,gBASxE;AAED,wBAAsB,UAAU,CAAC,EAC/B,KAAK,EACL,GAAQ,EACR,OAAO,EAAE,IAAS,EAClB,IAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzB,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,iBA+FA;AAED,wBAAsB,aAAa,CAAC,EAClC,IAAI,EACJ,IAAI,EACJ,OAAO,EAAE,IAAS,EAClB,IAAS,GACV,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,6BAiEA;AAED,wBAAsB,WAAW,CAAC,EAChC,KAAK,EACL,IAAS,EACT,OAAO,EAAE,GAAQ,EACjB,IAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,gBA6CA;AAED,wBAAsB,WAAW,CAAC,EAChC,KAAK,EACL,IAAI,EACJ,OAAO,EAAE,GAAQ,EACjB,IAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,gBA2CA;AAED,wBAAsB,OAAO,kBAmC5B"}
1
+ {"version":3,"file":"functions.d.ts","sourceRoot":"","sources":["../functions.ts"],"names":[],"mappings":"AAoCA,wBAAsB,SAAS,kBAkH9B;AAED,wBAAsB,SAAS,kBAiJ9B;AAED,wBAAsB,SAAS,kBAkM9B;AAED,wBAAsB,WAAW,CAAC,EAChC,IAAI,EACJ,IAAI,EACJ,IAAS,GACV,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B;;eAqBA;AAED,wBAAsB,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,GAAG,CAAA;CAAE,gBASxE;AAED,wBAAsB,UAAU,CAAC,EAC/B,KAAK,EACL,GAAQ,EACR,OAAO,EAAE,IAAS,EAClB,IAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzB,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,iBA+FA;AAED,wBAAsB,aAAa,CAAC,EAClC,IAAI,EACJ,IAAI,EACJ,OAAO,EAAE,IAAS,EAClB,IAAS,GACV,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,6BAiEA;AAED,wBAAsB,WAAW,CAAC,EAChC,KAAK,EACL,IAAS,EACT,OAAO,EAAE,GAAQ,EACjB,IAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,gBA6CA;AAED,wBAAsB,WAAW,CAAC,EAChC,KAAK,EACL,IAAI,EACJ,OAAO,EAAE,GAAQ,EACjB,IAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B,gBA2CA;AAED,wBAAsB,OAAO,kBAmC5B"}
package/dist/functions.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import path from "node:path";
2
2
  import { existsSync, readdirSync, readFileSync, mkdirSync, writeFileSync, } from "node:fs";
3
- import { createHash } from "node:crypto";
3
+ import { createHash, randomUUID } from "node:crypto";
4
4
  import { fileURLToPath } from "node:url";
5
5
  import config from "./config.js";
6
6
  import getTemplatePath from "./server/plugins/table/funcs/getTemplatePath.js";
@@ -12,11 +12,14 @@ import getMenu from "./server/routes/menu/controllers/getMenu.js";
12
12
  import getSelectVal from "./server/plugins/table/funcs/metaFormat/getSelectVal.js";
13
13
  import locales from "./server/routes/table/controllers/utils/locales.js";
14
14
  import pgClients from "./server/plugins/pg/pgClients.js";
15
+ import { readdir } from "node:fs/promises";
16
+ import { readFile } from "node:fs/promises";
15
17
  const { client } = pgClients;
16
18
  const rclient = getRedis();
17
19
  // core templates && cls
18
20
  const filename = fileURLToPath(import.meta.url);
19
21
  const cwd = path.dirname(filename);
22
+ const shortId = () => randomUUID().split("-").pop() || "";
20
23
  export async function onListen1() {
21
24
  const json = await getMenu({ user: { uid: "1" }, pg: client }, null).catch(); // prevent "too many clients already" from crashing the application
22
25
  // insert interface list to db (user access management)
@@ -178,6 +181,124 @@ export async function onListen2() {
178
181
  console.trace(err);
179
182
  }
180
183
  }
184
+ export async function onListen3() {
185
+ const clsQuery = [];
186
+ if (client && !client?.pk && client?.init) {
187
+ await client.init();
188
+ }
189
+ if (!client?.pk?.["admin.dictionaries"])
190
+ return;
191
+ try {
192
+ const dictionaries = existsSync("dictionaries")
193
+ ? (await readdir("dictionaries", { withFileTypes: true }))
194
+ .filter((el) => el.isFile() && path.extname(el.name) === ".json")
195
+ .map((el) => el.name)
196
+ : [];
197
+ if (!dictionaries?.length)
198
+ return;
199
+ const uniqueDictionaries = dictionaries.filter((el, idx, arr) => arr.indexOf(el) === idx);
200
+ const hashes = await rclient
201
+ .hgetall("dictionaries-insert-hashes")
202
+ .then((obj) => Object.keys(obj));
203
+ const dbdata = await client
204
+ .query(`select json_object_agg(code, hash) from admin.dictionaries where system is true`)
205
+ .then((el) => el.rows?.[0]?.json_object_agg || {});
206
+ const codes = Object.keys(dbdata);
207
+ console.log("admin/hook dictionaries promise start");
208
+ const qHashes = await Promise.all(uniqueDictionaries.map(async (dictFileName) => {
209
+ const { code, name, module: moduleName, editable, values: arr, } = JSON.parse(await readFile(`dictionaries/${dictFileName}`, "utf-8"));
210
+ const hash = createHash("md5")
211
+ .update(JSON.stringify(arr || ""))
212
+ .digest("hex");
213
+ const dbhash = dbdata[code];
214
+ // check for changes by redis hash / dropped from db / changed at git project
215
+ const update = code &&
216
+ (!hashes.includes(hash) || !codes.includes(code) || hash !== dbhash);
217
+ if (update) {
218
+ const id = shortId();
219
+ const mainArgs = [
220
+ id,
221
+ code,
222
+ name,
223
+ moduleName,
224
+ "git",
225
+ editable || false,
226
+ true,
227
+ hash,
228
+ ];
229
+ const mainQuery = `insert into admin.dictionaries(id,code,name,module,source,editable,system,hash) values($1::text,$2,$3,$4,$5,$6,$7,$8)`;
230
+ const itemsArgs = [];
231
+ const itemArgsLength = 8;
232
+ const itemsQuery = `insert into admin.dictionary_items(dictionary_id,code,name,icon,color,parent_id,system,sort_order) values ${arr.map((_, idx) => `(${Array.from({ length: itemArgsLength }, (_, i) => `$${itemsArgs.length + i + 1 + idx * itemArgsLength}${i <= 5 ? "::text" : ""}`).join(",")})`)}`;
233
+ arr.forEach((el) => {
234
+ itemsArgs.push(id);
235
+ itemsArgs.push(el.code);
236
+ itemsArgs.push(el.name);
237
+ itemsArgs.push(el.icon);
238
+ itemsArgs.push(el.color);
239
+ itemsArgs.push(el.parent_id);
240
+ itemsArgs.push(true);
241
+ itemsArgs.push(el.sort || 0);
242
+ });
243
+ if (config.trace) {
244
+ console.log(code, "insert fresh dictionary");
245
+ }
246
+ return {
247
+ code,
248
+ update,
249
+ hash,
250
+ mainQuery,
251
+ mainArgs,
252
+ itemsQuery,
253
+ itemsArgs,
254
+ };
255
+ }
256
+ else {
257
+ if (config.trace) {
258
+ console.log(code, codes.includes(code)
259
+ ? "skip equal hash dictionary"
260
+ : "insert missing dictionary");
261
+ }
262
+ return { code, update, hash, equalHash: hashes.includes(hash) };
263
+ }
264
+ }));
265
+ // debug
266
+ const logDir = path.join(cwd, "log/migration");
267
+ mkdirSync(logDir, { recursive: true });
268
+ writeFileSync(path.join(logDir, `${path.basename(cwd)}-${client.options?.database}-dictionaries.sql`), clsQuery.filter(Boolean).join(";"));
269
+ writeFileSync(path.join(logDir, `${path.basename(cwd)}-${client.options?.database}-dictionaries.json`), JSON.stringify(dictionaries));
270
+ const updateIds = qHashes
271
+ .filter((el) => el.mainQuery)
272
+ .map((el) => el.code);
273
+ const rowCountItems = await client
274
+ .query("delete from admin.dictionary_items where dictionary_id in (select id from admin.dictionaries where system is true and code=any($1::text[]))", [updateIds])
275
+ .then((r) => r.rowCount || 0);
276
+ const rowCount = await client
277
+ .query("delete from admin.dictionaries where system is true and code=any($1::text[])", [updateIds])
278
+ .then((r) => r.rowCount || 0);
279
+ console.log("fastify-table/hook old dictionaries deleted", rowCount, rowCountItems);
280
+ if (qHashes.find((el) => el && el.mainQuery)) {
281
+ await Promise.all(qHashes
282
+ .filter((el) => el && el.mainQuery)
283
+ .map(async ({ hash, mainQuery, mainArgs, itemsQuery, itemsArgs, }) => {
284
+ await client.query(mainQuery, mainArgs);
285
+ await client.query(itemsQuery, itemsArgs);
286
+ rclient.hset("dictionaries-insert-hashes", hash, 1);
287
+ }));
288
+ logger.file("migration/hash", {
289
+ list: qHashes.filter(Boolean),
290
+ dictionaries: true,
291
+ });
292
+ console.log("fastify-table/hook dictionaries sql finish");
293
+ }
294
+ else {
295
+ console.log("fastify-table/hook dictionaries sql insert skipped");
296
+ }
297
+ }
298
+ catch (err) {
299
+ console.error("fastify-table/hook dictionaries sql error", err.toString());
300
+ }
301
+ }
181
302
  export async function preTemplate({ name, type, user = {}, }) {
182
303
  if (!name || !type)
183
304
  return;
package/dist/helper.d.ts CHANGED
@@ -1,6 +1,26 @@
1
1
  import config from "./config.js";
2
2
  import { pgClients } from "./utils.js";
3
3
  declare const prefix: any;
4
+ export declare function injectWithHeaders(opts: any): Promise<{
5
+ json: () => unknown;
6
+ body: unknown;
7
+ headers: {
8
+ [k: string]: string;
9
+ };
10
+ statusCode: number;
11
+ ok: boolean;
12
+ status: number;
13
+ statusText: string;
14
+ type: import("undici-types").ResponseType;
15
+ url: string;
16
+ redirected: boolean;
17
+ bodyUsed: boolean;
18
+ arrayBuffer: () => Promise<ArrayBuffer>;
19
+ blob: () => Promise<import("node:buffer").Blob>;
20
+ bytes: () => Promise<Uint8Array>;
21
+ formData: () => Promise<import("undici-types").FormData>;
22
+ text: () => Promise<string>;
23
+ }>;
4
24
  export declare function setup(): Promise<void>;
5
25
  export declare function teardown(): Promise<void>;
6
26
  export declare function build(): Promise<any>;
@@ -1 +1 @@
1
- {"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../helper.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,QAAA,MAAQ,MAAM,KAAoB,CAAC;AAInC,wBAAsB,KAAK,kBAI1B;AAGD,wBAAsB,QAAQ,kBAW7B;AAED,wBAAsB,KAAK,iBA+B1B;AAED,OAAO,EAEL,MAAM,EACN,MAAM,EACN,SAAS,GACV,CAAC"}
1
+ {"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../helper.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,QAAA,MAAQ,MAAM,KAAoB,CAAC;AAInC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,GAAG;;;;;;;;;;;;;;;;;;;GAiChD;AAED,wBAAsB,KAAK,kBAI1B;AAGD,wBAAsB,QAAQ,kBAW7B;AAED,wBAAsB,KAAK,iBA+B1B;AAED,OAAO,EAEL,MAAM,EACN,MAAM,EACN,SAAS,GACV,CAAC"}
package/dist/helper.js CHANGED
@@ -4,6 +4,32 @@ import appService from "./index.js";
4
4
  import { pgClients } from "./utils.js";
5
5
  const { prefix = "/api" } = config;
6
6
  let app;
7
+ export async function injectWithHeaders(opts) {
8
+ const port = app.server.address().port;
9
+ const headers = opts.headers || {};
10
+ if (opts?.method && ["POST", "PUT"].includes(opts.method) && opts.payload) {
11
+ Object.assign(headers, { "Content-Type": "application/json" });
12
+ }
13
+ const url = new URL(`http://127.0.0.1:${port}${opts.url}`);
14
+ Object.keys(opts.query || {}).forEach((key) => url.searchParams.set(key, opts.query[key]));
15
+ const res = await fetch(url, {
16
+ method: opts.method || "GET",
17
+ body: opts.payload ? JSON.stringify(opts.payload) : undefined,
18
+ headers,
19
+ });
20
+ const body = res.headers.get("content-type") &&
21
+ res.headers.get("content-type")?.startsWith("application/json")
22
+ ? await res.json()
23
+ : await res.text();
24
+ const headers1 = Object.fromEntries(res.headers.entries());
25
+ return {
26
+ ...res,
27
+ json: () => body,
28
+ body,
29
+ headers: headers1,
30
+ statusCode: res.status,
31
+ };
32
+ }
7
33
  export async function setup() {
8
34
  console.log("Global setup");
9
35
  app = await build();
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AA8FA,iBAAe,MAAM,CAAC,OAAO,EAAE,GAAG,iBAmPjC;;AACD,wBAEG"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAgGA,iBAAe,MAAM,CAAC,OAAO,EAAE,GAAG,iBAsPjC;;AACD,wBAEG"}
package/dist/index.js CHANGED
@@ -9,7 +9,7 @@ const cwd = path.dirname(filename);
9
9
  config.templates?.forEach((el) => addTemplateDir(el));
10
10
  addTemplateDir(path.join(cwd, "module/core"));
11
11
  import config from "./config.js";
12
- import { preForm, afterInsert, afterTable, afterTemplate, afterUpdate, preTemplate, onReady, onListen1, onListen2, } from "./functions.js";
12
+ import { preForm, afterInsert, afterTable, afterTemplate, afterUpdate, preTemplate, onReady, onListen1, onListen2, onListen3, } from "./functions.js";
13
13
  import addHook from "./server/plugins/hook/addHook.js";
14
14
  const { maxFileSize = 512 } = config;
15
15
  const { name: execName } = path.parse(process.argv0);
@@ -40,7 +40,7 @@ import execMigrations from "./server/plugins/migration/exec.migrations.js";
40
40
  import pgClients from "./server/plugins/pg/pgClients.js";
41
41
  // routes
42
42
  import cronRoutes from "./server/routes/cron/index.js";
43
- import crudRoutes from "./server/routes/crud/index.js";
43
+ import crudRoutes from "./server/routes/crud/crud.route.js";
44
44
  import loggerRoutes from "./server/routes/logger/index.js";
45
45
  import propertiesRoutes from "./server/routes/properties/index.js";
46
46
  import tableRoutes from "./server/routes/table/index.js";
@@ -56,6 +56,7 @@ import uploadChunkRoutes from "./server/routes/upload/index.js";
56
56
  import grpcRoutes from "./server/routes/grpc/index.js";
57
57
  import notificationsRoutes from "./server/routes/notifications/index.js";
58
58
  import userClsRoutes from "./server/routes/usercls/index.js";
59
+ import dictionariesRoutes from "./server/routes/dictionaries/dictionaries.route.js";
59
60
  import apiListService from "./server/routes/util/controllers/api.list.js";
60
61
  addHook("preForm", preForm);
61
62
  addHook("afterTable", afterTable);
@@ -138,6 +139,7 @@ async function plugin(fastify) {
138
139
  });
139
140
  fastify.addHook("onListen", onListen1);
140
141
  fastify.addHook("onListen", onListen2);
142
+ fastify.addHook("onListen", onListen3);
141
143
  fastify.addHook("onReady", onReady);
142
144
  // core migrations (second argument for core only)
143
145
  execMigrations(path.join(cwd, "server/migrations"), pgClients.client, true).catch((err) => console.warn(err.toString()));
@@ -226,6 +228,7 @@ async function plugin(fastify) {
226
228
  // from admin
227
229
  fastify.register(notificationsRoutes, opt);
228
230
  fastify.register(userClsRoutes, opt);
231
+ fastify.register(dictionariesRoutes, opt);
229
232
  config.proxy?.forEach?.((el) => {
230
233
  if (execName === "bun") {
231
234
  fastify.all(`${el.source}/*`, async (req, reply) => {
@@ -0,0 +1,79 @@
1
+ create schema if not exists admin;
2
+
3
+ DO $$
4
+ BEGIN
5
+ IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'dictionary_source_enum') THEN
6
+ CREATE TYPE admin.dictionary_source_enum AS ENUM (
7
+ 'git',
8
+ 'custom'
9
+ );
10
+ END IF;
11
+ END $$;
12
+
13
+ CREATE TABLE if not exists admin.dictionaries (
14
+ id text PRIMARY KEY DEFAULT public.next_id(),
15
+
16
+ code VARCHAR(100) NOT NULL UNIQUE,
17
+ name VARCHAR(255) NOT NULL,
18
+ module VARCHAR(50),
19
+ description TEXT,
20
+
21
+ source admin.dictionary_source_enum NOT NULL DEFAULT 'custom',
22
+ editable BOOLEAN NOT NULL DEFAULT true,
23
+ system BOOLEAN NOT NULL DEFAULT false,
24
+
25
+ hash text,
26
+
27
+ created_at TIMESTAMP NOT NULL DEFAULT now(),
28
+ updated_at TIMESTAMP NOT NULL DEFAULT now()
29
+ );
30
+
31
+ CREATE TABLE if not exists admin.dictionary_items (
32
+ id text PRIMARY KEY DEFAULT public.next_id(),
33
+
34
+ dictionary_id text NOT NULL REFERENCES admin.dictionaries(id) ON DELETE CASCADE,
35
+
36
+ code VARCHAR(100) NOT NULL,
37
+ name VARCHAR(255) NOT NULL,
38
+ description TEXT,
39
+
40
+ color VARCHAR(20),
41
+ icon VARCHAR(50),
42
+
43
+ sort_order INTEGER NOT NULL DEFAULT 0,
44
+
45
+ parent_id text,
46
+
47
+ active BOOLEAN NOT NULL DEFAULT true,
48
+ system BOOLEAN NOT NULL DEFAULT false,
49
+
50
+ metadata JSONB NOT NULL DEFAULT '{}'::jsonb,
51
+
52
+ created_at TIMESTAMP NOT NULL DEFAULT now(),
53
+ updated_at TIMESTAMP NOT NULL DEFAULT now(),
54
+
55
+ CONSTRAINT admin_dictionary_items_dictionary_code_unique
56
+ UNIQUE (code, dictionary_id)
57
+ );
58
+
59
+ ALTER TABLE admin.dictionary_items
60
+ DROP CONSTRAINT if exists admin_dictionary_items_dictionary_code_unique cascade;
61
+
62
+ ALTER TABLE admin.dictionary_items
63
+ ADD CONSTRAINT admin_dictionary_items_dictionary_code_unique UNIQUE (code, dictionary_id);
64
+
65
+ ALTER TABLE admin.dictionary_items
66
+ DROP CONSTRAINT if exists admin_dictionary_items_parent_same_dictionary_fk;
67
+
68
+ ALTER TABLE admin.dictionary_items
69
+ ADD CONSTRAINT admin_dictionary_items_parent_same_dictionary_fk FOREIGN KEY (parent_id, dictionary_id)
70
+ REFERENCES admin.dictionary_items (code, dictionary_id)
71
+ ON DELETE SET NULL;
72
+
73
+ CREATE INDEX if not exists admin_dictionary_items_dictionary_id_idx ON admin.dictionary_items (dictionary_id);
74
+
75
+ CREATE INDEX if not exists admin_dictionary_items_parent_id_idx ON admin.dictionary_items (parent_id);
76
+
77
+ CREATE INDEX if not exists admin_dictionary_items_sort_order_idx ON admin.dictionary_items (dictionary_id, sort_order);
78
+
79
+ CREATE INDEX if not exists admin_dictionary_items_active_idx ON admin.dictionary_items (dictionary_id, active);
@@ -1,7 +1,8 @@
1
1
  declare const resourcesList: any;
2
2
  declare const publicResourcesList: any[];
3
3
  declare const resources: any;
4
- export { resourcesList, publicResourcesList, resources };
4
+ declare const resourcesObject: any;
5
+ export { resourcesList, publicResourcesList, resources, resourcesObject };
5
6
  declare const _default: null;
6
7
  export default _default;
7
8
  //# sourceMappingURL=getResources.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"getResources.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/access/funcs/getResources.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,aAAa,KAEb,CAAC;AAEP,QAAA,MAAM,mBAAmB,EAAE,GAAG,EAO7B,CAAC;AAEF,QAAA,MAAM,SAAS,KAGd,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,SAAS,EAAE,CAAC;;AACzD,wBAAoB"}
1
+ {"version":3,"file":"getResources.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/access/funcs/getResources.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,aAAa,KAEb,CAAC;AAEP,QAAA,MAAM,mBAAmB,EAAE,GAAG,EAO7B,CAAC;AAEF,QAAA,MAAM,SAAS,KAGd,CAAC;AAEF,QAAA,MAAM,eAAe,KAMpB,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC;;AAC1E,wBAAoB"}
@@ -9,5 +9,9 @@ const publicResourcesList = resourcesList.map(({ name, title, actions, feature }
9
9
  feature,
10
10
  }));
11
11
  const resources = resourcesList.reduce((acc, curr) => ({ ...acc, [curr.name]: curr.table }), {});
12
- export { resourcesList, publicResourcesList, resources };
12
+ const resourcesObject = resourcesList.reduce((acc, curr) => ({
13
+ ...acc,
14
+ [curr.name]: { table: curr.table, form: curr.form },
15
+ }), {});
16
+ export { resourcesList, publicResourcesList, resources, resourcesObject };
13
17
  export default null;
@@ -1,5 +1,5 @@
1
1
  import type { ExtendedPG } from "../../../types/core.js";
2
- export default function dataDelete({ table: table1, tokenData, referer, id, pg: pg1, uid, query, }: {
2
+ export default function dataDelete({ table: table1, tokenData, referer, id, pg: pg1, uid, query, args, }: {
3
3
  table: string;
4
4
  tokenData?: Record<string, any>;
5
5
  referer?: string;
@@ -7,5 +7,6 @@ export default function dataDelete({ table: table1, tokenData, referer, id, pg:
7
7
  pg?: ExtendedPG;
8
8
  uid: string | number;
9
9
  query?: string;
10
+ args?: any[];
10
11
  }): Promise<any>;
11
12
  //# sourceMappingURL=dataDelete.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"dataDelete.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataDelete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAezD,wBAA8B,UAAU,CAAC,EACvC,KAAK,EAAE,MAAM,EACb,SAAS,EACT,OAAO,EACP,EAAE,EACF,EAAE,EAAE,GAAG,EACP,GAAG,EACH,KAAK,GACN,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,gBA+FA"}
1
+ {"version":3,"file":"dataDelete.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataDelete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAezD,wBAA8B,UAAU,CAAC,EACvC,KAAK,EAAE,MAAM,EACb,SAAS,EACT,OAAO,EACP,EAAE,EACF,EAAE,EAAE,GAAG,EACP,GAAG,EACH,KAAK,EACL,IAAI,GACL,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;CACd,gBA+FA"}
@@ -7,7 +7,7 @@ import extraData from "../../extra/extraData.js";
7
7
  import logChanges from "./utils/logChanges.js";
8
8
  import logger from "../../logger/getLogger.js";
9
9
  const rclient = getRedis();
10
- export default async function dataDelete({ table: table1, tokenData, referer, id, pg: pg1, uid, query, }) {
10
+ export default async function dataDelete({ table: table1, tokenData, referer, id, pg: pg1, uid, query, args, }) {
11
11
  const pg = pg1 || getPG({ name: "client" });
12
12
  if (!pg)
13
13
  return null;
@@ -47,7 +47,7 @@ export default async function dataDelete({ table: table1, tokenData, referer, id
47
47
  row,
48
48
  }, client);
49
49
  const res = await client
50
- .query(delQuery, [id])
50
+ .query(delQuery, [id].concat(args || []))
51
51
  .then((el) => (el.rows?.[0] ? { rowCount: 1, ...el.rows[0] } : {}));
52
52
  await logChanges({
53
53
  pg: client,
@@ -1,2 +1,2 @@
1
- export default function getOpt(token: any, uid?: number): Promise<any>;
1
+ export default function getOpt(token: any, uid?: string): Promise<any>;
2
2
  //# sourceMappingURL=getOpt.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"getOpt.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/getOpt.ts"],"names":[],"mappings":"AAKA,wBAA8B,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,SAAI,gBAQvD"}
1
+ {"version":3,"file":"getOpt.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/getOpt.ts"],"names":[],"mappings":"AAKA,wBAA8B,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,SAAM,gBAQzD"}
@@ -1,7 +1,7 @@
1
1
  import config from "../../../../config.js";
2
2
  import getRedis from "../../redis/funcs/getRedis.js";
3
3
  const rclient = getRedis({ db: 0 });
4
- export default async function getOpt(token, uid = 0) {
4
+ export default async function getOpt(token, uid = "0") {
5
5
  if (!config.redis)
6
6
  return null;
7
7
  const key = `opt:${uid}:${token}`;
@@ -1,2 +1,2 @@
1
- export default function setOpt(params: any, uid?: number): string | null;
1
+ export default function setOpt(params: any, uid?: string): string | null;
2
2
  //# sourceMappingURL=setOpt.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"setOpt.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/setOpt.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,SAAI,iBAalD"}
1
+ {"version":3,"file":"setOpt.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/setOpt.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,SAAM,iBAapD"}
@@ -6,7 +6,7 @@ const rclient = getRedis({ db: 0 });
6
6
  function md5(string) {
7
7
  return createHash("md5").update(string).digest("hex");
8
8
  }
9
- export default function setOpt(params, uid = 0) {
9
+ export default function setOpt(params, uid = "0") {
10
10
  if (!config.redis)
11
11
  return null;
12
12
  const token = Buffer.from(md5(typeof params === "object" ? JSON.stringify(params) : params) + random, "hex")
@@ -1,6 +1,6 @@
1
1
  declare function setToken({ ids: idsOrigin, uid, array, }: {
2
2
  ids: any[];
3
- uid: string;
3
+ uid?: string;
4
4
  array?: boolean | number;
5
5
  }): any;
6
6
  export default setToken;
@@ -1 +1 @@
1
- {"version":3,"file":"setToken.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/setToken.ts"],"names":[],"mappings":"AA2BA,iBAAS,QAAQ,CAAC,EAChB,GAAG,EAAE,SAAS,EACd,GAAG,EACH,KAAK,GACN,EAAE;IACD,GAAG,EAAE,GAAG,EAAE,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B,GAAG,GAAG,CA2BN;AAED,eAAe,QAAQ,CAAC"}
1
+ {"version":3,"file":"setToken.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/setToken.ts"],"names":[],"mappings":"AA2BA,iBAAS,QAAQ,CAAC,EAChB,GAAG,EAAE,SAAS,EACd,GAAG,EACH,KAAK,GACN,EAAE;IACD,GAAG,EAAE,GAAG,EAAE,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B,GAAG,GAAG,CA2BN;AAED,eAAe,QAAQ,CAAC"}
@@ -0,0 +1,32 @@
1
+ export default function dataAPI({ table, id, page, limit: queryLimit, sql, filter: queryFilter, search: querySearch, state, custom, order: queryOrder, desc: queryDesc, bbox: bboxParam, polyline: polylineParam, query: queryParam, omitGeometry: omitGeometryParam, uid, referer, public: ispublicParam, userType, contextQuery, searchColumn, sufix, filterList, actions: actionsParam, accessQuery: accessQueryParam, columns: columnsParam, isExport, called, args: paramsArgs, }: {
2
+ table?: string;
3
+ id?: string;
4
+ limit?: number;
5
+ page?: number;
6
+ sql?: number;
7
+ filter?: string;
8
+ search?: string;
9
+ state?: string;
10
+ custom?: string;
11
+ order?: string;
12
+ desc?: string;
13
+ bbox?: string;
14
+ polyline?: string;
15
+ query?: string;
16
+ omitGeometry?: boolean;
17
+ referer?: string;
18
+ public?: boolean;
19
+ uid?: string;
20
+ userType?: string;
21
+ contextQuery?: string;
22
+ searchColumn?: string;
23
+ sufix?: boolean;
24
+ filterList?: any[];
25
+ actions?: string[];
26
+ accessQuery?: string;
27
+ columns?: string[];
28
+ isExport?: boolean;
29
+ called?: boolean;
30
+ args?: any[];
31
+ }, pg?: any): Promise<any>;
32
+ //# sourceMappingURL=getData.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getData.ts"],"names":[],"mappings":"AAuFA,wBAA8B,OAAO,CACnC,EACE,KAAK,EACL,EAAE,EACF,IAAI,EACJ,KAAK,EAAE,UAAU,EACjB,GAAG,EACH,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,WAAW,EACnB,KAAK,EACL,MAAM,EACN,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,UAAU,EACjB,YAAY,EAAE,iBAAyB,EACvC,GAAG,EACH,OAAO,EACP,MAAM,EAAE,aAAa,EACrB,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,EACrB,QAAgB,EAChB,MAAc,EACd,IAAI,EAAE,UAAe,GACtB,EAAE;IACD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;CACd,EACD,EAAE,MAAmB,gBAg4BtB"}