@opengis/fastify-table 2.0.146 → 2.0.148

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AA4FA,iBAAS,MAAM,CAAC,OAAO,EAAE,GAAG,QA6K3B;;AACD,wBAA0B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AA4FA,iBAAS,MAAM,CAAC,OAAO,EAAE,GAAG,QA8K3B;;AACD,wBAA0B"}

package/dist/index.js

@@ -125,7 +125,7 @@ function plugin(fastify) {
             timeWindow: config.rateLimit?.timeWindow || 60000,
             hook: "preHandler",
             global: true,
-            keyGenerator: (req) => `${req.ip}-${req.raw.url.split("?")[0]}`,
+            keyGenerator: (req) => `${req.user?.uid || req.ip}-${req.raw.url.split("?")[0]}`,
         });
     }
     else {

package/dist/server/routes/table/controllers/suggest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAiHA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA6WzD"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAuHA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBA6WzD"}

package/dist/server/routes/table/controllers/suggest.js

@@ -25,6 +25,14 @@ async function getTableColumnMeta({ table, template, column, selectName, filtere
         .filter((el) => !el.disabled && el.sql && el.sql.includes(column) && false)
         .map((el, i) => ` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `)
         ?.join("") || "";
+    // w/out select
+    const searchQueryDefault = startsWith && key
+        ? `(left(lower("text"::text),${key.length}) = $1 )`
+        : '(lower("text"::text) ~ $1 )';
+    // w/ select
+    const searchQuerySelect = startsWith && key
+        ? `id in ( with cc(id, text) as (${select}) select id from cc where (left(lower("text"),${key.length})=$1) )`
+        : `id in ( with cc(id, text) as (${select}) select id from cc where (lower("text") ~ $1) )`;
     if (pg.pgType?.[dataTypeID]?.includes("[]")) {
         const original = filtered
             ? `with c(id,text) as (select id, id as text from (select unnest(${column}) as id from ${tableName} t ${sqlTable})q group by id) select id, text from c`
@@ -32,9 +40,7 @@ async function getTableColumnMeta({ table, template, column, selectName, filtere
         return {
             arr,
             original,
-            searchQuery: startsWith && key
-                ? `(left(lower("text"::text),${key.length}) = $1 )`
-                : '(lower("text"::text) ~ $1 )',
+            searchQuery: select ? searchQuerySelect : searchQueryDefault,
             pk: "id",
         };
     }
@@ -44,9 +50,7 @@ async function getTableColumnMeta({ table, template, column, selectName, filtere
     return {
         arr,
         original,
-        searchQuery: startsWith && key
-            ? `(left(lower("text"),${key.length}) = $1 )`
-            : '(lower("text") ~ $1 )',
+        searchQuery: select ? searchQuerySelect : searchQueryDefault,
         pk: "id",
     };
 }
@@ -252,7 +256,7 @@ export default async function suggest(req, reply) {
     const where = [search, val, filter, meta.pk ? `${meta.pk} is not null` : null]
         .filter(Boolean)
         .join(" and ") || "true";
-    const sqlSuggest = `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} ${meta.original.includes("order by") ? "" : "order by 2"}) select * from c where ${filter} limit ${Math.min(query.limit || meta.limit || limit, limit)}`.replace(/{{uid}}/g, user?.uid || "0");
+    const sqlSuggest = `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} ${meta.original.toLowerCase().includes("order by") ? "" : "order by 2"}) select * from c where ${filter} limit ${Math.min(query.limit || meta.limit || limit, limit)}`.replace(/{{uid}}/g, user?.uid || "0");
     if (query.sql && debugMode) {
         return sqlSuggest;
     }

package/dist/server/routes/util/controllers/dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../../server/routes/util/controllers/dependencies.ts"],"names":[],"mappings":"AAQA,wBAA8B,iBAAiB,CAAC,GAAG,EAAE,GAAG,eAUvD"}
+{"version":3,"file":"dependencies.d.ts","sourceRoot":"","sources":["../../../../../server/routes/util/controllers/dependencies.ts"],"names":[],"mappings":"AAQA,wBAA8B,iBAAiB,CAAC,GAAG,EAAE,GAAG,eAcvD"}

package/dist/server/routes/util/controllers/dependencies.js

@@ -9,5 +9,14 @@ export default async function dumpInstalledDeps(app) {
         ...json.dependencies,
         ...(json.devDependencies || {}),
         ...(json.peerDependencies || {}),
-    }).reduce((acc, curr) => Object.assign(acc, { [curr]: require(`${curr}/package.json`).version }), {});
+    }).reduce((acc, curr) => {
+        try {
+            Object.assign(acc, { [curr]: require(`${curr}/package.json`).version });
+        }
+        catch (err) {
+            Object.assign(acc, { [curr]: err.toString() });
+            // skip packages that does not explicidly provide access to package.json
+        }
+        return acc;
+    }, {});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.0.146",
+  "version": "2.0.148",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -15,7 +15,8 @@
   "exports": {
     ".": "./dist/index.js",
     "./index.js": "./dist/index.js",
-    "./utils.js": "./dist/utils.js"
+    "./utils.js": "./dist/utils.js",
+    "./package.json": "./package.json"
   },
   "files": [
     "dist/*"