@opengis/fastify-table 2.5.53 → 2.5.54

package/dist/server/plugins/table/funcs/getFilterSQLParametrized/formatValue.d.ts.map

@@ -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"}
+{"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

@@ -133,9 +133,13 @@ export default function formatValue({ table, filter = {}, name, value, dataTypeI
     // boolean + nullable
     const value1 = ["true", "false"].find((el) => value.includes(el));
     const values = ["true", "false"].filter((el) => value.includes(el));
+    // boolean: true, false and null => skip
+    if (fieldType === "boolean" && values.length === 2 && !!includesNullQuery) {
+        return { op, query: "3=3" };
+    }
     // boolean: both true and false => not null
     if (fieldType === "boolean" && values.length === 2) {
-        return { op, query: "is not null" };
+        return { op, query: `${name} is not null` };
     }
     // boolean: not null over any value
     if (fieldType === "boolean" &&
@@ -252,7 +256,7 @@ export default function formatValue({ table, filter = {}, name, value, dataTypeI
             };
         }
         const query = `${name}::text=any($${args.length})`;
-        return { op: "=", query, values: [[value]] };
+        return { op: "=", query, values: [value.split(",")] };
     }
     return {};
 }

package/dist/server/plugins/table/funcs/getFilterSQLParametrized/getRangeQuery.d.ts.map

@@ -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;;;;;;EAoNA"}
+{"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

@@ -188,9 +188,7 @@ export default function getRangeQuery({ value, name, fieldType, filterType, sql,
             args.push(min || max);
         }
         return {
-            query: sql
-                .replace(/\$1/g, `$${checkBoth ? args.length - 1 : args.length}::date`)
-                .replace(/\$2/g, `$${args.length}::date`),
+            query: sql,
             values: checkBoth ? [min, max] : [min || max],
         };
     }
@@ -204,9 +202,7 @@ export default function getRangeQuery({ value, name, fieldType, filterType, sql,
             args.push(min || max);
         }
         return {
-            query: sql
-                .replace(/\$1/g, `${checkBoth ? args.length - 1 : args.length}`)
-                .replace(/\$2/g, `${args.length}`),
+            query: sql,
             values: checkBoth ? [min, max] : [min || max],
         };
     }

package/dist/server/routes/table/functions/getData.js

@@ -667,13 +667,13 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         total,
         filtered,
         count: rows.length,
+        rows,
         pk,
         form,
         agg,
         status,
         panels,
         html,
-        rows,
         meta,
         columns: columns1,
         filters: filters?.map?.((el) => ({

package/dist/server/routes/table/schema.d.ts.map

@@ -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"}
+{"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

@@ -1,3 +1,7 @@
+const keySchema = {
+    type: "string",
+    pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-:]+)$",
+};
 const tableDataSchema = {
     type: "object",
     properties: {
@@ -59,7 +63,7 @@ const searchSchema = {
             limit: { type: "integer", minimum: 1 },
             order: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
             desc: { type: "string", pattern: "^(\\d+)$" },
-            key: { type: "string", pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$" },
+            key: keySchema,
             table: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
             sql: { type: "integer", enum: [1] },
         },
@@ -74,7 +78,7 @@ const suggestSchema = {
             parent: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
             sel: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
             name: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
-            key: { type: "string", pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$" },
+            key: keySchema,
             val: { type: "string", pattern: "([\\d\\w]+)$" },
             sql: { type: "integer", enum: [1] },
             count: { type: "integer", enum: [1] },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.5.53",
+  "version": "2.5.54",
   "type": "module",
   "description": "core-plugins",
   "keywords": [