@opengis/fastify-table 2.0.32 → 2.0.33

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 (10) hide show
  1. package/dist/server/routes/table/controllers/tableData.d.ts +1 -1
  2. package/dist/server/routes/table/controllers/tableData.d.ts.map +1 -1
  3. package/dist/server/routes/table/controllers/tableData.js +1 -1
  4. package/dist/server/routes/table/functions/getData.d.ts +7 -5
  5. package/dist/server/routes/table/functions/getData.d.ts.map +1 -1
  6. package/dist/server/routes/table/functions/getData.js +43 -42
  7. package/dist/utils.d.ts +1 -1
  8. package/dist/utils.d.ts.map +1 -1
  9. package/dist/utils.js +1 -1
  10. package/package.json +1 -1
package/dist/server/routes/table/controllers/tableData.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import { FastifyReply } from "fastify";
2
- export default function getTableData(req: any, reply: FastifyReply, called?: any): Promise<any>;
2
+ export default function tableData(req: any, reply: FastifyReply, called?: any): Promise<any>;
3
3
  //# sourceMappingURL=tableData.d.ts.map
package/dist/server/routes/table/controllers/tableData.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tableData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/tableData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,wBAA8B,YAAY,CACxC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBA+Bb"}
1
+ {"version":3,"file":"tableData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/tableData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,wBAA8B,SAAS,CACrC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBA+Bb"}
package/dist/server/routes/table/controllers/tableData.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import pgClients from "../../../plugins/pg/pgClients.js";
2
2
  import getData from "../functions/getData.js";
3
- export default async function getTableData(req, reply, called) {
3
+ export default async function tableData(req, reply, called) {
4
4
  const { user, params, headers, query, pg = pgClients.client } = req;
5
5
  // це можна від користувача
6
6
  const q = `select attr,
package/dist/server/routes/table/functions/getData.d.ts CHANGED
@@ -1,18 +1,20 @@
1
1
  import type { FastifyReply } from "fastify";
2
2
  import type { ExtendedPG } from "../../../types/core.js";
3
- export default function dataAPI({ pg, params, headers, query, user, contextQuery, sufix, filterList, actions: actionsParam, }: {
3
+ export default function dataAPI({ pg, params, table, id, headers, query, user, contextQuery, sufix, filterList, actions: actionsParam, }: {
4
4
  pg: ExtendedPG;
5
- params: {
5
+ params?: {
6
6
  id?: string;
7
7
  query?: string;
8
8
  table: string;
9
9
  };
10
+ table?: string;
11
+ id?: string;
10
12
  headers: Record<string, any>;
11
- query: Record<string, any>;
13
+ query?: Record<string, any>;
12
14
  user: Record<string, any>;
13
- contextQuery: any;
15
+ contextQuery?: string;
14
16
  sufix?: boolean;
15
17
  filterList?: any[];
16
18
  actions?: string[];
17
- }, reply: FastifyReply, called: any): Promise<any>;
19
+ }, reply: FastifyReply, called?: any): Promise<any>;
18
20
  //# sourceMappingURL=getData.d.ts.map
package/dist/server/routes/table/functions/getData.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4DzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACvD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,YAAY,EAAE,GAAG,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBAmzBZ"}
1
+ {"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4DzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,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;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBAkzBb"}
package/dist/server/routes/table/functions/getData.js CHANGED
@@ -39,29 +39,34 @@ function getOrder(queryOrder, queryDesc, defaultOrder, columnList, iscalled = fa
39
39
  const checkInline = {};
40
40
  const maxLimit = 100;
41
41
  const defaultLimit = 20;
42
- export default async function dataAPI({ pg = pgClients.client, params, headers = {}, query = {}, user = {}, contextQuery, sufix = true, filterList, actions: actionsParam, }, reply, called) {
42
+ export default async function dataAPI({ pg = pgClients.client, params, table, id, headers = {}, query = {}, user = {}, contextQuery, sufix = true, filterList, actions: actionsParam, }, reply, called) {
43
43
  const time = Date.now();
44
44
  const timeArr = [Date.now()];
45
45
  const { uid } = user;
46
46
  const checkQuery = (item) => user?.user_type === "superadmin" ? !item.includes("{{uid}}") : true;
47
+ const paramsTable = params?.table || table;
48
+ if (!paramsTable) {
49
+ return { message: "not enough params: table", status: 400 };
50
+ }
51
+ const paramsId = params?.id || id;
47
52
  const hookData = (await applyHook("preData", {
48
53
  pg,
49
- table: params?.table,
50
- id: params?.id,
54
+ table: paramsTable,
55
+ id: paramsId,
51
56
  user,
52
57
  }));
53
58
  if (hookData?.message && hookData?.status) {
54
59
  return { message: hookData?.message, status: hookData?.status };
55
60
  }
56
61
  /* from tableData START */
57
- const tokenData1 = await getOpt(params.table, uid);
62
+ const tokenData1 = await getOpt(paramsTable, uid);
58
63
  const tokenData2 = await getToken({
59
64
  uid,
60
- token: params.table,
65
+ token: paramsTable,
61
66
  json: true,
62
67
  });
63
68
  const tokenData = tokenData1 || tokenData2;
64
- const templateName = tokenData?.table || hookData?.table || params.table;
69
+ const templateName = tokenData?.table || hookData?.table || paramsTable;
65
70
  const loadTable = await getTemplate("table", templateName);
66
71
  if (tokenData?.table && !loadTable) {
67
72
  const { rows = [], fields = [] } = await pg.query(`select ${tokenData.columns || "*"} from ${tokenData.table} where ${tokenData.query || "true"} limit 10`);
@@ -75,9 +80,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
75
80
  }
76
81
  /* from tableData END */
77
82
  // check sql inline fields count
78
- if (!checkInline[params?.table] &&
79
- loadTable?.sql?.length &&
80
- loadTable.table) {
83
+ if (!checkInline[paramsTable] && loadTable?.sql?.length && loadTable.table) {
81
84
  const filterSql = loadTable.sql.filter((el) => !el?.disabled && (el.inline ?? true));
82
85
  const sqlTable = filterSql
83
86
  .map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)
@@ -89,33 +92,33 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
89
92
  filterSql[i].inline = el.length === 1;
90
93
  filterSql[i].fields = el.map((f) => f.name);
91
94
  });
92
- checkInline[params?.table] = loadTable.sql;
95
+ checkInline[paramsTable] = loadTable.sql;
93
96
  }
94
- else if (checkInline[params?.table]) {
95
- loadTable.sql = checkInline[params?.table];
97
+ else if (checkInline[paramsTable]) {
98
+ loadTable.sql = checkInline[paramsTable];
96
99
  }
97
100
  if (query.sql === "0")
98
101
  return loadTable;
99
102
  if (!pg) {
100
103
  return reply.status(500).send("empty pg");
101
104
  }
102
- const pkey = pg.pk?.[params?.table] || pg.pk?.[params?.table.replace(/"/g, "")];
105
+ const pkey = pg.pk?.[paramsTable] || pg.pk?.[paramsTable.replace(/"/g, "")];
103
106
  if (!loadTable &&
104
107
  !(tokenData?.table && pg.pk?.[tokenData?.table]) &&
105
108
  !(called && pkey)) {
106
109
  return reply.status(404).send("template not found");
107
110
  }
108
- const id = tokenData?.id || hookData?.id || params?.id;
111
+ const id1 = tokenData?.id || hookData?.id || paramsId;
109
112
  const { actions = [], query: accessQuery } = (await getAccess({
110
113
  table: templateName,
111
- id,
114
+ id: id1,
112
115
  user,
113
116
  }, pg));
114
117
  if (!actions.includes("view") && !config?.local && !called) {
115
118
  return reply.status(403).send("access restricted");
116
119
  }
117
120
  const body = loadTable || hookData || tokenData;
118
- const { table, columns = [], sql, cardSql, form, meta, sqlColumns, public: ispublic, editable = false, } = loadTable || hookData || tokenData || params;
121
+ const { table: table1, columns = [], sql, cardSql, form, meta, sqlColumns, public: ispublic, editable = false, } = loadTable || hookData || tokenData || params || { table };
119
122
  /* const filters = ((body?.filter_list || [])
120
123
  .concat(body?.filterInline || [])
121
124
  .concat(body?.filterCustom || [])
@@ -127,7 +130,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
127
130
  // console.warn('invalid filters in template: filter_list / filterList');
128
131
  // logger.file('crud/warning', { msg: 'invalid filters', template: templateName });
129
132
  }
130
- const objectId = tokenData?.id || hookData?.id || params.id;
133
+ const objectId = tokenData?.id || hookData?.id || paramsId;
131
134
  const { list: filters = [] } = objectId
132
135
  ? {}
133
136
  : (await getFilter({
@@ -135,11 +138,11 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
135
138
  table: templateName,
136
139
  user,
137
140
  }, null)) || {};
138
- const tableMeta = await getMeta({ pg, table });
141
+ const tableMeta = await getMeta({ pg, table: table1 });
139
142
  timeArr.push(Date.now());
140
143
  if (tableMeta?.view) {
141
144
  if (!loadTable?.key && !tokenData?.key)
142
- return { message: `key not found: ${table}`, status: 404 };
145
+ return { message: `key not found: ${table1}`, status: 404 };
143
146
  Object.assign(tableMeta, { pk: loadTable?.key || tokenData?.key });
144
147
  }
145
148
  const { pk, columns: dbColumns = [] } = tableMeta || {};
@@ -150,10 +153,10 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
150
153
  type: pg.pgType?.[dataTypeID],
151
154
  }));
152
155
  columns1.forEach((col) => {
153
- Object.assign(col, locales[`${table || params.table}.${col.name}`] || {});
156
+ Object.assign(col, locales[`${table1 || paramsTable}.${col.name}`] || {});
154
157
  });
155
158
  if (!pk) {
156
- return reply.status(404).send(`table not found: ${table}`);
159
+ return reply.status(404).send(`table not found: ${table1}`);
157
160
  }
158
161
  const columnList = dbColumns.map((el) => el.name || el).join(",");
159
162
  const sqlTable = sql
@@ -163,7 +166,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
163
166
  (!el.sql.includes("{{uid}}") || uid))
164
167
  .map((el, i) => ` left join lateral (${el.sql.replace("{{uid}}", uid)}) ${el.name || `t${i}`} on 1=1 `)
165
168
  ?.join("") || "";
166
- const cardSqlFiltered = hookData?.id || params.id
169
+ const cardSqlFiltered = hookData?.id || paramsId
167
170
  ? cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []
168
171
  : [];
169
172
  const cardSqlTable = cardSqlFiltered.length
@@ -176,7 +179,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
176
179
  ?.map((el) => `,(${el.sql})`)
177
180
  ?.join("") || "";
178
181
  const { fields = [] } = pg.queryCache
179
- ? await pg.queryCache(`select * ${sqlInline} from ${table} t ${sqlTable} ${cardSqlTable} limit 0`)
182
+ ? await pg.queryCache(`select * ${sqlInline} from ${table1} t ${sqlTable} ${cardSqlTable} limit 0`)
180
183
  : {};
181
184
  const dbColumnsTable = fields.map((el) => el.name);
182
185
  const cols = columns
@@ -188,11 +191,11 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
188
191
  ?.filter((el) => !cols.includes(el))
189
192
  .join(",")}`
190
193
  : "";
191
- if (params.id && columnList.includes(params.id)) {
194
+ if (paramsId && columnList.includes(paramsId)) {
192
195
  return gisIRColumn({
193
196
  pg,
194
- layer: params.table,
195
- column: params.id,
197
+ layer: paramsTable,
198
+ column: paramsId,
196
199
  sql: query.sql,
197
200
  filter: query.filter,
198
201
  search: query.search,
@@ -211,7 +214,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
211
214
  const fData = checkFilter
212
215
  ? await getFilterSQL({
213
216
  pg,
214
- table: loadTable ? params.table : table,
217
+ table: loadTable ? paramsTable : table1,
215
218
  filter: query.filter,
216
219
  search: query.search,
217
220
  state: query.state,
@@ -266,7 +269,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
266
269
  ? await handlebars.compile(params?.query)({ user, uid })
267
270
  : undefined;
268
271
  const where = [
269
- tokenData?.id || hookData?.id || params.id ? ` "${pk}" = $1` : null,
272
+ id1 ? ` "${pk}" = $1` : null,
270
273
  keyQuery,
271
274
  loadTable?.query,
272
275
  tokenData?.query,
@@ -282,7 +285,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
282
285
  .filter(Boolean)
283
286
  .filter((el) => checkQuery(el));
284
287
  const q = `select ${pk ? `"${pk}" as id,` : ""}
285
- ${params.id || query.key ? "*" : sqlColumns || cols || "*"}
288
+ ${paramsId || query.key ? "*" : sqlColumns || cols || "*"}
286
289
  ${metaCols}
287
290
 
288
291
  ${dbColumns.filter((el) => pg.pgType?.[el.dataTypeID] === "geometry").length
@@ -294,9 +297,9 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
294
297
  from (select * ${sql
295
298
  ?.filter((el) => el.inline)
296
299
  .map((el) => `,(${el.sql})`)
297
- .join("") || ""} from ${table} t ${sqlTable} ) t
300
+ .join("") || ""} from ${table1} t ${sqlTable} ) t
298
301
 
299
- ${params.id ? cardSqlTable : ""}
302
+ ${paramsId ? cardSqlTable : ""}
300
303
  where ${where.join(" and ") || "true"}
301
304
  ${order} ${offset} limit ${limit}`.replace(/{{uid}}/g, uid);
302
305
  if (config.trace)
@@ -305,9 +308,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
305
308
  return q;
306
309
  }
307
310
  const { rows = [] } = await pg
308
- .query(q, (tokenData?.id || hookData?.id || params.id
309
- ? [tokenData?.id || hookData?.id || params.id]
310
- : null) || (query.key && loadTable.key ? [query.key] : []))
311
+ .query(q, (id1 ? [id1] : null) || (query.key && loadTable.key ? [query.key] : []))
311
312
  .catch((err) => {
312
313
  console.error(err.toString());
313
314
  throw err;
@@ -373,7 +374,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
373
374
  from (select * ${sql
374
375
  ?.filter((el) => el.inline)
375
376
  .map((el) => `,(${el.sql})`)
376
- .join("") || ""} from ${table} t ${sqlTable})q
377
+ .join("") || ""} from ${table1} t ${sqlTable})q
377
378
  where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery]
378
379
  .filter(Boolean)
379
380
  .filter((el) => checkQuery(el))
@@ -381,7 +382,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
381
382
  if (query.sql === "2") {
382
383
  return qCount;
383
384
  }
384
- const counts = keyQuery || tokenData?.id || hookData?.id || params.id
385
+ const counts = keyQuery || id1
385
386
  ? { total: rows.length, filtered: rows.length }
386
387
  : await pg
387
388
  .queryCache?.(qCount, {
@@ -468,7 +469,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
468
469
  .map(async (el) => {
469
470
  const filtered1 = el.items.filter((item) => item.count?.toLowerCase?.().includes("select"));
470
471
  const data = await Promise.all(filtered1.map(async (item) => pg
471
- .query(item.count.replace(/{{id}}/g, params.id))
472
+ .query(item.count.replace(/{{id}}/g, paramsId))
472
473
  .then((item1) => item1.rows[0] || {})));
473
474
  filtered1.forEach((el1, i) => {
474
475
  // el1.title = data[i].title;
@@ -480,7 +481,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
480
481
  .join(" union all ");
481
482
  const counts1 = q1 && id
482
483
  ? await pg
483
- .query(q1, [id])
484
+ .query(q1, [id1])
484
485
  .then((e) => e.rows.reduce((acc, curr) => Object.assign(acc, { [curr.component]: curr.count }), {}))
485
486
  : {};
486
487
  el.items
@@ -497,7 +498,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
497
498
  data: rows[0],
498
499
  user,
499
500
  uid,
500
- id,
501
+ id: id1,
501
502
  });
502
503
  const { rows: sqlData } = await pg.query(q2);
503
504
  data[el.name] = sqlData;
@@ -527,7 +528,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
527
528
  const name = el[0].substring(0, el[0].lastIndexOf("."));
528
529
  logger.file("handlebars/error", {
529
530
  table,
530
- id: params.id,
531
+ id: paramsId,
531
532
  error: err.toString(),
532
533
  stack: err.stack,
533
534
  });
@@ -537,7 +538,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
537
538
  }
538
539
  const route = pg.tlist?.includes?.("admin.routes")
539
540
  ? await pg
540
- .query("select route_id as path, title from admin.routes where enabled and alias=$1 limit 1", [params.table])
541
+ .query("select route_id as path, title from admin.routes where enabled and alias=$1 limit 1", [paramsTable])
541
542
  .then((el) => el.rows?.[0] || {})
542
543
  : {};
543
544
  const res = {
@@ -601,7 +602,7 @@ export default async function dataAPI({ pg = pgClients.client, params, headers =
601
602
  const result = await applyHook("afterData", {
602
603
  pg,
603
604
  table: loadTable?.table || tokenData?.table,
604
- id: tokenData?.id || hookData?.id || params.id,
605
+ id: id1,
605
606
  template: templateName,
606
607
  payload: res,
607
608
  user,
package/dist/utils.d.ts CHANGED
@@ -29,7 +29,7 @@ export { default as getFilterSQL } from "./server/plugins/table/funcs/getFilterS
29
29
  export { default as getSelect } from "./server/plugins/table/funcs/getSelect.js";
30
30
  export { default as getSelectMeta } from "./server/plugins/table/funcs/getSelectMeta.js";
31
31
  export { default as gisIRColumn } from "./server/plugins/table/funcs/gisIRColumn.js";
32
- export { default as getData } from "./server/plugins/table/funcs/getData.js";
32
+ export { default as getData } from "./server/routes/table/functions/getData.js";
33
33
  export { default as getMenu } from "./server/routes/menu/controllers/getMenu.js";
34
34
  export { default as getFilter } from "./server/plugins/table/funcs/getFilter.js";
35
35
  export { default as dataInsert } from "./server/plugins/crud/funcs/dataInsert.js";
package/dist/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../utils.ts"],"names":[],"mappings":"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"}
package/dist/utils.js CHANGED
@@ -36,7 +36,7 @@ export { default as getFilterSQL } from "./server/plugins/table/funcs/getFilterS
36
36
  export { default as getSelect } from "./server/plugins/table/funcs/getSelect.js";
37
37
  export { default as getSelectMeta } from "./server/plugins/table/funcs/getSelectMeta.js";
38
38
  export { default as gisIRColumn } from "./server/plugins/table/funcs/gisIRColumn.js";
39
- export { default as getData } from "./server/plugins/table/funcs/getData.js";
39
+ export { default as getData } from "./server/routes/table/functions/getData.js";
40
40
  export { default as getMenu } from "./server/routes/menu/controllers/getMenu.js";
41
41
  export { default as getFilter } from "./server/plugins/table/funcs/getFilter.js";
42
42
  // crud
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opengis/fastify-table",
3
- "version": "2.0.32",
3
+ "version": "2.0.33",
4
4
  "type": "module",
5
5
  "description": "core-plugins",
6
6
  "keywords": [