@opengis/fastify-table 2.5.52 → 2.5.54

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 (8) hide show
  1. package/dist/server/plugins/table/funcs/getFilterSQLParametrized/formatValue.d.ts.map +1 -1
  2. package/dist/server/plugins/table/funcs/getFilterSQLParametrized/formatValue.js +6 -2
  3. package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getRangeQuery.d.ts.map +1 -1
  4. package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getRangeQuery.js +4 -6
  5. package/dist/server/routes/table/functions/getData.js +1 -1
  6. package/dist/server/routes/table/schema.d.ts.map +1 -1
  7. package/dist/server/routes/table/schema.js +6 -2
  8. package/package.json +1 -1
package/dist/server/plugins/table/funcs/getFilterSQLParametrized/formatValue.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"formatValue.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQLParametrized/formatValue.ts"],"names":[],"mappings":"AAkBA,MAAM,CAAC,OAAO,UAAU,WAAW,CACjC,EACE,KAAK,EACL,MAAW,EACX,IAAI,EACJ,KAAK,EACL,UAAU,EACV,GAAS,EACT,QAAQ,EACR,IAAI,EAAE,UAAU,GACjB,EAAE,GAAG,EACN,EAAE,MAAmB,OAkTtB"}
1
+ {"version":3,"file":"formatValue.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQLParametrized/formatValue.ts"],"names":[],"mappings":"AAkBA,MAAM,CAAC,OAAO,UAAU,WAAW,CACjC,EACE,KAAK,EACL,MAAW,EACX,IAAI,EACJ,KAAK,EACL,UAAU,EACV,GAAS,EACT,QAAQ,EACR,IAAI,EAAE,UAAU,GACjB,EAAE,GAAG,EACN,EAAE,MAAmB,OAuTtB"}
package/dist/server/plugins/table/funcs/getFilterSQLParametrized/formatValue.js CHANGED
@@ -133,9 +133,13 @@ export default function formatValue({ table, filter = {}, name, value, dataTypeI
133
133
  // boolean + nullable
134
134
  const value1 = ["true", "false"].find((el) => value.includes(el));
135
135
  const values = ["true", "false"].filter((el) => value.includes(el));
136
+ // boolean: true, false and null => skip
137
+ if (fieldType === "boolean" && values.length === 2 && !!includesNullQuery) {
138
+ return { op, query: "3=3" };
139
+ }
136
140
  // boolean: both true and false => not null
137
141
  if (fieldType === "boolean" && values.length === 2) {
138
- return { op, query: "is not null" };
142
+ return { op, query: `${name} is not null` };
139
143
  }
140
144
  // boolean: not null over any value
141
145
  if (fieldType === "boolean" &&
@@ -252,7 +256,7 @@ export default function formatValue({ table, filter = {}, name, value, dataTypeI
252
256
  };
253
257
  }
254
258
  const query = `${name}::text=any($${args.length})`;
255
- return { op: "=", query, values: [[value]] };
259
+ return { op: "=", query, values: [value.split(",")] };
256
260
  }
257
261
  return {};
258
262
  }
package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getRangeQuery.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getRangeQuery.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQLParametrized/getRangeQuery.ts"],"names":[],"mappings":"AA0NA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,KAAK,EACL,IAAI,EACJ,SAAS,EACT,UAAU,EACV,GAAG,EACH,KAAK,EACL,EAAE,EACF,IAAI,EAAE,UAAU,GACjB,EAAE;IACD,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;;;;;;EAkNA"}
1
+ {"version":3,"file":"getRangeQuery.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQLParametrized/getRangeQuery.ts"],"names":[],"mappings":"AA0NA,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,KAAK,EACL,IAAI,EACJ,SAAS,EACT,UAAU,EACV,GAAG,EACH,KAAK,EACL,EAAE,EACF,IAAI,EAAE,UAAU,GACjB,EAAE;IACD,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,GAAG,EAAE,CAAC;CACb;;;;;;EAgNA"}
package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getRangeQuery.js CHANGED
@@ -188,9 +188,7 @@ export default function getRangeQuery({ value, name, fieldType, filterType, sql,
188
188
  args.push(min || max);
189
189
  }
190
190
  return {
191
- query: sql
192
- .replace(/\$1/g, `$${checkBoth ? args.length - 1 : args.length}::date`)
193
- .replace(/\$2/g, `$${args.length}::date`),
191
+ query: sql,
194
192
  values: checkBoth ? [min, max] : [min || max],
195
193
  };
196
194
  }
@@ -204,9 +202,7 @@ export default function getRangeQuery({ value, name, fieldType, filterType, sql,
204
202
  args.push(min || max);
205
203
  }
206
204
  return {
207
- query: sql
208
- .replace(/\$1/g, `${checkBoth ? args.length - 1 : args.length}`)
209
- .replace(/\$2/g, `${args.length}`),
205
+ query: sql,
210
206
  values: checkBoth ? [min, max] : [min || max],
211
207
  };
212
208
  }
@@ -333,6 +329,8 @@ export default function getRangeQuery({ value, name, fieldType, filterType, sql,
333
329
  values: [min, max],
334
330
  };
335
331
  }
332
+ args.push(min);
333
+ args.push(max);
336
334
  return {
337
335
  query: `${name} between $${args.length - 1} and $${args.length}`,
338
336
  values: [min, max],
package/dist/server/routes/table/functions/getData.js CHANGED
@@ -667,13 +667,13 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
667
667
  total,
668
668
  filtered,
669
669
  count: rows.length,
670
+ rows,
670
671
  pk,
671
672
  form,
672
673
  agg,
673
674
  status,
674
675
  panels,
675
676
  html,
676
- rows,
677
677
  meta,
678
678
  columns: columns1,
679
679
  filters: filters?.map?.((el) => ({
package/dist/server/routes/table/schema.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../server/routes/table/schema.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyBpB,CAAC;AAEF,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BhB,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAajB,CAAC;AAEF,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsBlB,CAAC;AAEF,QAAA,MAAM,UAAU;;;;;;;;;;;;;;CAQf,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;CAOjB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;CAatB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;CAQtB,CAAC;AAEF,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,aAAa,EACb,UAAU,EACV,YAAY,EACZ,iBAAiB,GAClB,CAAC"}
1
+ {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../server/routes/table/schema.ts"],"names":[],"mappings":"AAKA,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyBpB,CAAC;AAEF,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BhB,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAajB,CAAC;AAEF,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsBlB,CAAC;AAEF,QAAA,MAAM,UAAU;;;;;;;;;;;;;;CAQf,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;CAOjB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;CAatB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;CAQtB,CAAC;AAEF,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,aAAa,EACb,UAAU,EACV,YAAY,EACZ,iBAAiB,GAClB,CAAC"}
package/dist/server/routes/table/schema.js CHANGED
@@ -1,3 +1,7 @@
1
+ const keySchema = {
2
+ type: "string",
3
+ pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-:]+)$",
4
+ };
1
5
  const tableDataSchema = {
2
6
  type: "object",
3
7
  properties: {
@@ -59,7 +63,7 @@ const searchSchema = {
59
63
  limit: { type: "integer", minimum: 1 },
60
64
  order: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
61
65
  desc: { type: "string", pattern: "^(\\d+)$" },
62
- key: { type: "string", pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$" },
66
+ key: keySchema,
63
67
  table: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
64
68
  sql: { type: "integer", enum: [1] },
65
69
  },
@@ -74,7 +78,7 @@ const suggestSchema = {
74
78
  parent: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
75
79
  sel: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
76
80
  name: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
77
- key: { type: "string", pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$" },
81
+ key: keySchema,
78
82
  val: { type: "string", pattern: "([\\d\\w]+)$" },
79
83
  sql: { type: "integer", enum: [1] },
80
84
  count: { type: "integer", enum: [1] },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opengis/fastify-table",
3
- "version": "2.5.52",
3
+ "version": "2.5.54",
4
4
  "type": "module",
5
5
  "description": "core-plugins",
6
6
  "keywords": [