@opengis/fastify-table 2.5.15 → 2.5.17

package/dist/server/plugins/policy/funcs/checkPolicy.js

@@ -13,7 +13,7 @@ export default function checkPolicy(req, jwt) {
     const { role, referer, policy = [], } = (routeOptions?.config || {});
     // role=admin|regular
     const isRole = (role && (!user?.user_type || !role?.includes?.(user?.user_type))) ||
-        (policy.includes("admin") && user?.user_type !== "admin");
+        (policy.includes("admin") && !user?.user_type?.includes?.("admin"));
     const allowExtPublic = [".png", ".jpg", ".svg"];
     const ext = path.toLowerCase().substr(-4);
     const isPublic = Array.isArray(policy)

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

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAqB5C,wBAA8B,QAAQ,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBA+PZ"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../../../server/routes/crud/controllers/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAqB5C,wBAA8B,QAAQ,CACpC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,GAAG,gBAoQZ"}

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

@@ -47,11 +47,11 @@ export default async function tableAPI(req, reply, called) {
     const table = loadTable?.table || table1;
     const form = loadTable?.form || form1;
     const id = hookData?.id || tokenData?.id || params.id;
-    if (tokenData && !id) {
+    if (tokenData && !table) {
         throw ForbiddenError("invalid token");
     }
-    if (!table && !id) {
-        throw BadRequestError("not enough params: table && id");
+    if (!table) {
+        throw BadRequestError("not enough params: table");
     }
     const { actions = [], query: accessQuery, message: accessMessage, } = (await getAccess({
         resource,
@@ -135,10 +135,12 @@ export default async function tableAPI(req, reply, called) {
             .join(";");
         return `${q};${extraQ || ""}`.replace(/\$1/g, `'${id}'`);
     }
-    const data = await pg
-        .query(q.replace(/{{uid}}/, user?.uid), [id])
-        .then((el) => el.rows[0]);
-    if (!data) {
+    const data = id
+        ? await pg
+            .query(q.replace(/{{uid}}/, user?.uid), [id])
+            .then((el) => el.rows[0])
+        : null;
+    if (id && !data) {
         throw NotFoundError(`object not found: ${id}`);
     }
     Object.keys(schema)
@@ -148,7 +150,7 @@ export default async function tableAPI(req, reply, called) {
             data[key] = null;
         }
     });
-    if (extraKeys?.length) {
+    if (id && extraKeys?.length) {
         await Promise.all(extraKeys?.map(async (key) => {
             const { colModel, table: extraTable, parent_id: parentId, } = schema[key];
             const colModel1 = Array.isArray(colModel)
@@ -167,7 +169,8 @@ export default async function tableAPI(req, reply, called) {
     if (user?.uid &&
         !config.security?.disableToken &&
         actions.includes("edit") &&
-        !called) {
+        !called &&
+        id) {
         data.token = tokenData?.table
             ? params.table
             : setToken({
@@ -176,7 +179,9 @@ export default async function tableAPI(req, reply, called) {
                 array: 1,
             })?.[0];
     }
-    await extraDataGet({ rows: [data], table, form }, pg);
+    if (id) {
+        await extraDataGet({ rows: [data], table, form }, pg);
+    }
     const res = await applyHook("afterTable", {
         pg,
         table,

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":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAwBpD,wBAAsB,kBAAkB,CAAC,EACvC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EACV,GAAG,EACH,EAAqB,GACtB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB;;;;;UAwFA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,gBAuX7C"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAwBpD,wBAAsB,kBAAkB,CAAC,EACvC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EACV,GAAG,EACH,EAAqB,GACtB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB;;;;;UAwFA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,gBAuY7C"}

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

@@ -141,9 +141,6 @@ export default async function suggest(req) {
         (metaColumns || []).find((col) => col?.name === column) ||
         {};
     const { dataTypeID } = (metaColumns || []).find((col) => col?.name === column) || {};
-    // const filters =
-    //   hookBody?.filters ||
-    //   (body ? await getFilter({ pg, table }).then((el) => el.list) : null);
     if (table && (!column || !columnName)) {
         throw BadRequestError("param name is invalid: 2");
     }
@@ -239,32 +236,57 @@ export default async function suggest(req) {
             data,
         };
     }
+    const args = [];
+    const where = [];
     // select, with search by text support
-    const search = query.key && typeof query.key === "string" ? searchQuery : null;
+    if (query.key && typeof query.key === "string") {
+        args.push(query.key.toLowerCase());
+        where.push(searchQuery);
+    }
+    // pk
+    if (meta.pk) {
+        where.push(`${meta.pk} is not null`);
+    }
     // filter by value
-    const val = query.val
-        ? `${meta.pk}=any('{${query.val.replace(/'/g, "''")}}')`
-        : "";
-    const filter = tableName && pg.pk?.[tableName] && columnName && dataTypeID
-        ? `id in (select ${pg.pgType[dataTypeID]?.includes("[]")
+    if (meta.pk && typeof query.val === "string") {
+        args.push(query.val.split(","));
+        where.push(`${meta.pk}=any($${args.length})`);
+    }
+    // filter
+    if (tableName && pg.pk?.[tableName] && columnName && dataTypeID) {
+        where.push(`id in (select ${pg.pgType[dataTypeID]?.includes("[]")
             ? `unnest(${columnName})`
-            : columnName} from ${tableName.replace(/'/g, "''")})`
-        : "true";
-    const where = [search, val, filter, meta.pk ? `${meta.pk} is not null` : null]
-        .filter(Boolean)
-        .join(" and ") || "true";
-    const sqlSuggest = tableName && column
+            : columnName} from ${tableName.replace(/'/g, "''")})`);
+    }
+    // order by value if not specified explicitly
+    const order = meta.original.toLowerCase().includes("order by")
+        ? ""
+        : "order by 2";
+    const whereQuery = where.filter(Boolean).join(" and ") || "true";
+    args.push(Math.min(query.limit || meta.limit || limit, limit));
+    let sqlSuggest = tableName && column
         ? `${meta.original}
-          WHERE EXISTS ( SELECT 1 FROM ${tableName} o WHERE o.${column} IS NOT DISTINCT FROM c.id ) and ${val || "true"} and ${search || "true"}
-          ${meta.original.toLowerCase().includes("order by") ? "" : "order by 2"}
-          LIMIT ${Math.min(query.limit || meta.limit || limit, limit)}`
-            .replace(/{{parent}}/gi, parent)
-            .replace(/{{uid}}/g, user?.uid || "0")
-        : `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");
+          WHERE EXISTS ( SELECT 1 FROM ${tableName} o 
+            WHERE o.${column} IS NOT DISTINCT FROM c.id ) and ${whereQuery || "true"}
+          ${order} LIMIT $${args.length}::int`
+        : `with c(id,text) as ( ${meta.original} where ${whereQuery} ${order}) select * from c LIMIT $${args.length}::int`;
+    if (sqlSuggest.includes("{{parent}}")) {
+        args.push(parent || "");
+        sqlSuggest = sqlSuggest.replace(/(['"]?){{parent}}\1/gi, `$${args.length}`);
+    }
+    if (sqlSuggest.includes("{{uid}}")) {
+        args.push(user?.uid || "0");
+        sqlSuggest = sqlSuggest.replace(/(['"]?){{uid}}\1/gi, `$${args.length}`);
+    }
     if (query.sql && debugMode) {
         return sqlSuggest;
     }
-    const { rows: dataNew } = await pg.query(sqlSuggest, query.key && typeof query.key === "string" ? [query.key.toLowerCase()] : []);
+    if (config.trace) {
+        console.log("suggest", sqlSuggest, where, args);
+    }
+    const dataNew = await pg
+        .query(sqlSuggest, args)
+        .then((r) => r.rows || []);
     // in case id / text = Boolean
     const data = dataNew.filter((el) => Object.hasOwn(el, "id") && Object.hasOwn(el, "text"));
     data

package/package.json

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