@opengis/fastify-table 2.6.0 → 2.6.2

package/dist/server/plugins/crud/funcs/dataUpdate.js

@@ -73,19 +73,19 @@ export default async function dataUpdate({ table: table1, tokenData, referer, id
     // update geometry with srid
     if (!srids[table] && pg.tlist?.includes("public.geometry_columns")) {
         const { srids1 } = await pg
-            .query(`select json_object_agg(_table,rel) as srids1 from (
-      select  f_table_schema||'.'||f_table_name as _table, 
-        json_object_agg(f_geometry_column, case when srid = 0 then 4326 else srid end) as rel 
-      from public.geometry_columns group by f_table_schema||'.'||f_table_name
+            .query(`select json_object_agg(_table,rel) as srids1 from (
+      select  f_table_schema||'.'||f_table_name as _table, 
+        json_object_agg(f_geometry_column, case when srid = 0 then 4326 else srid end) as rel 
+      from public.geometry_columns group by f_table_schema||'.'||f_table_name
       )q`)
             .then((el) => el.rows?.[0] || {});
         Object.assign(srids, srids1);
     }
-    const updateQuery = `UPDATE ${table} SET ${systemColumns ? `${systemColumns}${filterData?.length ? "," : ""}` : ""}
-
+    const updateQuery = `UPDATE ${table} SET ${systemColumns ? `${systemColumns}${filterData?.length ? "," : ""}` : ""}
+
   ${filterData
         ?.map((key, i) => assignValue(key, i, srids[table]?.[key] || 4326, pg.pgType?.[columns.find((col) => col.name === key)?.dataTypeID || ""]))
-        ?.join(",")} 
+        ?.join(",")} 
   WHERE ${pk}::text = $1::text returning *`;
     // console.log(updateQuery, filterValue);
     // for transactions

package/dist/server/plugins/crud/funcs/getAccess.js

@@ -10,20 +10,20 @@ const matches = {
     update: "edit",
     delete: "del",
 };
-const q = `select a.route_id as id, d.actions as user_roles, d.actions as role_actions, coalesce(b.actions, array['view']) as interface_actions, b.scope, c.role_id
-from admin.routes a 
-left join admin.role_access b on 
-  a.route_id=b.route_id
-left join admin.roles c on 
-  b.role_id=c.role_id 
-  and c.enabled
-left join admin.user_roles d on 
-  c.role_id=d.role_id 
-  and ( case when 
-            d.expiration is not null 
-            then d.expiration > CURRENT_DATE 
-            else 1=1 
-        end )
+const q = `select a.route_id as id, d.actions as user_roles, d.actions as role_actions, coalesce(b.actions, array['view']) as interface_actions, b.scope, c.role_id
+from admin.routes a 
+left join admin.role_access b on 
+  a.route_id=b.route_id
+left join admin.roles c on 
+  b.role_id=c.role_id 
+  and c.enabled
+left join admin.user_roles d on 
+  c.role_id=d.role_id 
+  and ( case when 
+            d.expiration is not null 
+            then d.expiration > CURRENT_DATE 
+            else 1=1 
+        end )
 where $1 in (a.route_id, a.alias, a.table_name) and $2 in (b.user_uid, d.user_uid)`;
 /**
  * @param {Array} user_roles.actions Actions - user actions <> group actions

package/dist/server/plugins/crud/funcs/utils/getInsertQuery.js

@@ -34,20 +34,20 @@ export default async function getInsertQuery({ pg, table, data, id, uid, }) {
         (["boolean", "number"].includes(typeof data[el]) ? true : data[el]) &&
         names.includes(el))
         .map((el) => [el, data[el]]);
-    const insertQuery = `insert into ${table}
-
+    const insertQuery = `insert into ${table}
+
     ( ${filterData
         ?.map((key) => `"${key[0]}"`)
         .concat(systemColumnNames)
-        .join(",")}) 
-
+        .join(",")}) 
+
     values  (${filterData
         ?.map((key, i) => key[0] === "geom"
         ? `st_setsrid(st_geomfromgeojson($${i + 1}::json),4326)`
         : `$${i + 1}`)
         .concat(systemColumns.map((el) => el[1]))
-        .join(",")}) 
-    
+        .join(",")}) 
+    
     returning *`;
     const args = [
         ...filterData.map((el) => typeof el[1] === "object" &&

package/dist/server/plugins/crud/funcs/utils/logChanges.js

@@ -71,25 +71,25 @@ export default async function logChanges({ pg, table: table1, tokenData, referer
     }
     try {
         const { change_id: changeId } = await pg
-            .query(`insert into log.table_changes(change_date,change_type,change_user_id,entity_type,entity_id) 
+            .query(`insert into log.table_changes(change_date,change_type,change_user_id,entity_type,entity_id) 
     values(CURRENT_DATE, $1, $2, $3, $4) returning change_id`, [type, uid, table, id])
             .then((el) => el.rows?.[0] || {});
-        const q = `select json_object_agg(entity_key, json_build_object('hash',value_hash,'value',value_new)) from (
-      select
-        entity_key,
-        value_hash,
-        value_new,
-        ( rank() over (partition by entity_key order by cdate desc) = 1 ) as is_latest
-      from log.table_changes_data
-
-      where change_id in (
-        select
-          change_id
-        from log.table_changes
-        where entity_id=$1
-        and entity_type=$2
-      )
-
+        const q = `select json_object_agg(entity_key, json_build_object('hash',value_hash,'value',value_new)) from (
+      select
+        entity_key,
+        value_hash,
+        value_new,
+        ( rank() over (partition by entity_key order by cdate desc) = 1 ) as is_latest
+      from log.table_changes_data
+
+      where change_id in (
+        select
+          change_id
+        from log.table_changes
+        where entity_id=$1
+        and entity_type=$2
+      )
+
     )q where is_latest`;
         // console.log(q, type, id);
         const old = type !== "INSERT"
@@ -168,7 +168,7 @@ export default async function logChanges({ pg, table: table1, tokenData, referer
         const res = await sequence(changesData, async (el) => {
             const insertQuery = `insert into log.table_changes_data (${Object.entries(el)
                 ?.map((key) => `"${key[0]}"`)
-                .join(",")}) 
+                .join(",")}) 
       values (${Object.entries(el)
                 ?.map((key, i) => `$${i + 1}`)
                 .join(",")}) returning *`;

package/dist/server/plugins/grpc/utils/convertp.proto

@@ -1,144 +1,144 @@
-syntax = "proto3";
-
-service Convert {
-  rpc HealthCheck (Empty) returns (HealthResponse);
-  rpc csvToXls(csvToXlsParams) returns (FileBase64) {}
-  rpc jsonToXls(jsonToXlsParams) returns (FileBase64) {}
-  rpc pdfMerge(pdfMergeParams) returns (FileBase64) {}
-  rpc htmlToPdf(htmlToPdfParams) returns (FileBase64) {}
-  rpc excelToJson(excelToJsonParams) returns (FileBase64) {}
-  rpc xmlToJson(xmlToJsonParams) returns (FileBase64) {}
-  rpc htmlToDoc(htmlToDocParams) returns (FileBase64) {}
-  rpc htmlToImage(htmlToImageParams) returns (FileBase64) {}
-  rpc geojsonToShp(geojsonToShpParams) returns (FileBase64) {}
-  rpc shpToGeojson(shpToGeojsonParams) returns (FileBase64) {}
-  rpc docToPDF(docToPDFParams) returns (FileBase64) {}
-  rpc mergeImages(mergeImagesIn) returns (FileBase64) {}
-  rpc resizeImage(resizeImageIn) returns (FileBase64) {}
-  rpc jsonToYaml(jsonToYamlIn) returns (FileBase64) {}
-  rpc yamlToJson(yamlToJsonIn) returns (FileBase64) {}
-  rpc log(log_in) returns (log_out) {}
-  rpc geojsonToGpkg(geojsonToShpParams) returns (FileBase64) {}
-}
-
-message Empty {}
-
-message HealthResponse {
-  string status = 1;
-}
-
-message jsonToYamlIn {
-  string json = 1;
-}
-
-message yamlToJsonIn {
-  string yaml = 1;
-}
-
-message resizeImageIn {
-  string base64 = 1;
-  uint64 width = 2;
-  uint64 height = 3;
-  uint32 quality = 4;
-  uint32 subsampling = 5;
-}
-
-message pdfToImgIn {
-  string pdfPath = 1;
-  string imgPath = 2;
-}
-
-message pdfToImgOut {
-  string imgPath = 1;
-}
-
-message log_in {
-	uint32 rows = 1;
-	string level = 2;
-}
-
-message log_out {
-	repeated string logs = 1;
-}
-
-enum mergeImageFormat {
-  VERTICAL = 0;
-  HORIZONTAL = 1;
-  OVERLAY = 2;
-}
-
-message imageMeta {
-  string base64 = 1;
-  mergeImageFormat mergeFormat = 2;
-}
-
-message mergeImagesIn {
-  repeated string images = 1;
-  repeated imageMeta imagesMeta = 2;
-  string background = 3;
-  string mergeFormat = 4;
-}
-
-message docToPDFParams {
-  string base64 = 1;
-  string to = 2;
-  string ext = 3;
-}
-
-message shpToGeojsonParams {
-  string base64 = 1;
-}
-
-message geojsonToShpParams {
-  string geojson = 1;
-  string proj = 2;
-}
-
-message xmlToJsonParams {
-  string xml = 1;
-}
-
-message jsonToXlsParams {
-  string json = 1;
-  string header = 2;
-  string subheader = 3;
-  string colmodel = 4;
-}
-
-message csvToXlsParams {
-  string csv = 1;
-  string header = 2;
-  string subheader = 3;
-  string separator = 4;
-}
-
-message excelToJsonParams {
-  string base64 = 1;
-  string type = 2;
-  string delimiter = 3;
-  string encoding = 4;
-}
-
-message htmlToPdfParams {
-  string html = 1;
-  string pdfPageConfig = 2;
-}
-
-message pdfMergeParams {
-  repeated string mergeFiles = 1;
-}
-
-message htmlToImageParams {
-  string html = 1;
-  string format = 2;
-  uint64 width = 3;
-  uint64 height = 4;
-}
-
-message htmlToDocParams {
-  string html = 1;
-}
-
-message FileBase64 {
-  string result = 1;
+syntax = "proto3";
+
+service Convert {
+  rpc HealthCheck (Empty) returns (HealthResponse);
+  rpc csvToXls(csvToXlsParams) returns (FileBase64) {}
+  rpc jsonToXls(jsonToXlsParams) returns (FileBase64) {}
+  rpc pdfMerge(pdfMergeParams) returns (FileBase64) {}
+  rpc htmlToPdf(htmlToPdfParams) returns (FileBase64) {}
+  rpc excelToJson(excelToJsonParams) returns (FileBase64) {}
+  rpc xmlToJson(xmlToJsonParams) returns (FileBase64) {}
+  rpc htmlToDoc(htmlToDocParams) returns (FileBase64) {}
+  rpc htmlToImage(htmlToImageParams) returns (FileBase64) {}
+  rpc geojsonToShp(geojsonToShpParams) returns (FileBase64) {}
+  rpc shpToGeojson(shpToGeojsonParams) returns (FileBase64) {}
+  rpc docToPDF(docToPDFParams) returns (FileBase64) {}
+  rpc mergeImages(mergeImagesIn) returns (FileBase64) {}
+  rpc resizeImage(resizeImageIn) returns (FileBase64) {}
+  rpc jsonToYaml(jsonToYamlIn) returns (FileBase64) {}
+  rpc yamlToJson(yamlToJsonIn) returns (FileBase64) {}
+  rpc log(log_in) returns (log_out) {}
+  rpc geojsonToGpkg(geojsonToShpParams) returns (FileBase64) {}
+}
+
+message Empty {}
+
+message HealthResponse {
+  string status = 1;
+}
+
+message jsonToYamlIn {
+  string json = 1;
+}
+
+message yamlToJsonIn {
+  string yaml = 1;
+}
+
+message resizeImageIn {
+  string base64 = 1;
+  uint64 width = 2;
+  uint64 height = 3;
+  uint32 quality = 4;
+  uint32 subsampling = 5;
+}
+
+message pdfToImgIn {
+  string pdfPath = 1;
+  string imgPath = 2;
+}
+
+message pdfToImgOut {
+  string imgPath = 1;
+}
+
+message log_in {
+	uint32 rows = 1;
+	string level = 2;
+}
+
+message log_out {
+	repeated string logs = 1;
+}
+
+enum mergeImageFormat {
+  VERTICAL = 0;
+  HORIZONTAL = 1;
+  OVERLAY = 2;
+}
+
+message imageMeta {
+  string base64 = 1;
+  mergeImageFormat mergeFormat = 2;
+}
+
+message mergeImagesIn {
+  repeated string images = 1;
+  repeated imageMeta imagesMeta = 2;
+  string background = 3;
+  string mergeFormat = 4;
+}
+
+message docToPDFParams {
+  string base64 = 1;
+  string to = 2;
+  string ext = 3;
+}
+
+message shpToGeojsonParams {
+  string base64 = 1;
+}
+
+message geojsonToShpParams {
+  string geojson = 1;
+  string proj = 2;
+}
+
+message xmlToJsonParams {
+  string xml = 1;
+}
+
+message jsonToXlsParams {
+  string json = 1;
+  string header = 2;
+  string subheader = 3;
+  string colmodel = 4;
+}
+
+message csvToXlsParams {
+  string csv = 1;
+  string header = 2;
+  string subheader = 3;
+  string separator = 4;
+}
+
+message excelToJsonParams {
+  string base64 = 1;
+  string type = 2;
+  string delimiter = 3;
+  string encoding = 4;
+}
+
+message htmlToPdfParams {
+  string html = 1;
+  string pdfPageConfig = 2;
+}
+
+message pdfMergeParams {
+  repeated string mergeFiles = 1;
+}
+
+message htmlToImageParams {
+  string html = 1;
+  string format = 2;
+  uint64 width = 3;
+  uint64 height = 4;
+}
+
+message htmlToDocParams {
+  string html = 1;
+}
+
+message FileBase64 {
+  string result = 1;
 }

package/dist/server/plugins/grpc/utils/htmlTemplate.js

@@ -1,13 +1,13 @@
 // TODO delete style when fully switch to the new code with merge
-const createTemplate = ({ domain, html }) => `<!DOCTYPE html>\
-<html>
-<head>
-  <base uri="http://${domain}/">
-  <meta charset="utf-8">
-  <style>html, body {font-size: 10pt !important;}</style>
-</head>
-<body>
-  ${html || ''}
-</body>
+const createTemplate = ({ domain, html }) => `<!DOCTYPE html>\
+<html>
+<head>
+  <base uri="http://${domain}/">
+  <meta charset="utf-8">
+  <style>html, body {font-size: 10pt !important;}</style>
+</head>
+<body>
+  ${html || ''}
+</body>
 </html`;
 export default createTemplate;

package/dist/server/plugins/grpc/utils/office2pdf.proto

@@ -1,14 +1,14 @@
-syntax = "proto3";
-
-service OfficeConverterService {
-  rpc OfficeToPdf(OfficeToPdfRequest) returns (OfficeToPdfResponse) {}
-}
-
-message OfficeToPdfRequest {
-  string file = 1;
-  string ext = 2;
-}
-
-message OfficeToPdfResponse {
-  string file = 1;
+syntax = "proto3";
+
+service OfficeConverterService {
+  rpc OfficeToPdf(OfficeToPdfRequest) returns (OfficeToPdfResponse) {}
+}
+
+message OfficeToPdfRequest {
+  string file = 1;
+  string ext = 2;
+}
+
+message OfficeToPdfResponse {
+  string file = 1;
 }

package/dist/server/plugins/metric/loggerSystem.js

@@ -12,7 +12,7 @@ const rclient2 = getRedis({ db: 2 });
 // const rclient10 = getRedis({ db: 10 });
 const filesFolder = getFolder(config);
 const redisKey = "logger-process-online";
-const sqlQuery = `select datname as dbname, application_name as app, client_addr as client_ip, 
+const sqlQuery = `select datname as dbname, application_name as app, client_addr as client_ip, 
 (now()-backend_start)::text as msec, state, query from pg_stat_activity where datname=$1`;
 const prev = {};
 const cpuUsage = () => {

package/dist/server/plugins/pg/funcs/autoIndex.js

@@ -43,7 +43,7 @@ export default async function autoIndex({ table, columns: filter1, pg = pgClient
     }
     const cols = tbs
         ? await pg
-            .query(`SELECT attrelid::regclass AS tbl, attname AS aname, atttypid::regtype  AS datatype, atttypid  
+            .query(`SELECT attrelid::regclass AS tbl, attname AS aname, atttypid::regtype  AS datatype, atttypid  
     FROM  pg_attribute WHERE  attrelid::regclass::text = $1 and attname = any($2::text[])`, [tbs, attrs])
             .then((el) => el.rows || [])
         : [];
@@ -78,13 +78,13 @@ export default async function autoIndex({ table, columns: filter1, pg = pgClient
                 qIndex.push(`CREATE INDEX if not exists ${name}_lower ON ${el.nspname}.${el.relname} USING ${indexUsing} (lower(${el.aname}) ${suffix})`);
             }
             if (indexUsing === "gist") {
-                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "gist1")}  
+                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "gist1")}  
           ON ${el.nspname}.${el.relname} USING gist (${el.aname})`);
-                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "area")}  
+                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "area")}  
           ON ${el.nspname}.${el.relname} USING btree (st_area(st_transform(${el.aname},3857)))`);
-                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "area_true")}  
+                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "area_true")}  
           ON ${el.nspname}.${el.relname} USING btree (st_area(${el.aname}, true))`);
-                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "4326")}  
+                qIndex.push(`CREATE INDEX if not exists ${name.replace("gist", "4326")}  
           ON ${el.nspname}.${el.relname} USING gist (st_transform(${el.aname},4326))`);
             }
         }

package/dist/server/plugins/pg/funcs/getMeta.js

@@ -24,12 +24,12 @@ export default async function getMeta(opt, nocache) {
         return data[pg.options.database][tableUnsafe];
     }
     const tableRows = await pg
-        .query(`SELECT
-        nspname || '.' || relname as name,
-        relkind
-      FROM pg_class a
-      JOIN pg_namespace b
-        ON b.oid = a.relnamespace
+        .query(`SELECT
+        nspname || '.' || relname as name,
+        relkind
+      FROM pg_class a
+      JOIN pg_namespace b
+        ON b.oid = a.relnamespace
       WHERE relkind IN ('r', 'v', 'm')`)
         .then((r) => r.rows || []);
     const tlist = tableRows.map((el) => el.name);
@@ -42,9 +42,9 @@ export default async function getMeta(opt, nocache) {
         .then((r) => r.fields || []);
     // remove quotes from table names
     const pks1 = await pg
-        .query(`SELECT json_object_agg(replace(c.conrelid::regclass::text,'"',''), a.attname) 
-  FROM pg_constraint c 
-    left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] 
+        .query(`SELECT json_object_agg(replace(c.conrelid::regclass::text,'"',''), a.attname) 
+  FROM pg_constraint c 
+    left join pg_attribute a on c.conrelid=a.attrelid and a.attnum = c.conkey[1] 
   WHERE c.contype='p'::"char"`)
         .then((r) => r.rows[0].json_object_agg || {});
     const pk = tableUnsafe.startsWith("public.")
@@ -53,12 +53,12 @@ export default async function getMeta(opt, nocache) {
     const geomColumns = fields.filter((el) => pg.pgType?.[el.dataTypeID] === "geometry");
     const geomAttr = geomColumns.find((el) => el.name === "geom_4326") || geomColumns[0];
     const dbColumns = await pg
-        .query(`select json_object_agg(
-    attname, 
-    json_build_object(
-      'title', pg_catalog.col_description(attrelid,attnum)
-    )
-  ) from pg_catalog.pg_attribute
+        .query(`select json_object_agg(
+    attname, 
+    json_build_object(
+      'title', pg_catalog.col_description(attrelid,attnum)
+    )
+  ) from pg_catalog.pg_attribute
   where attrelid=$1::regclass and attnum>0 and NOT attisdropped`, [tableSafe])
         .then((el) => el.rows?.[0]?.json_object_agg || {});
     fields.forEach((el) => Object.assign(el, { ...(dbColumns[el.name] || {}) }));

package/dist/server/plugins/pg/funcs/init.js

@@ -22,15 +22,15 @@ async function init(client) {
         .query(`SELECT json_object_agg(t.oid:: text, pg_catalog.format_type(t.oid, NULL)) FROM pg_catalog.pg_type t`)
         .then((el) => el.rows[0]?.json_object_agg || {});
     const pks = await client
-        .query(`
-    SELECT
-      connamespace::regnamespace::text,
-      conrelid::regclass,
-      (
-        SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid AND attnum = c.conkey[1]
-      ) as pk
-    FROM pg_constraint c
-    WHERE contype = 'p'
+        .query(`
+    SELECT
+      connamespace::regnamespace::text,
+      conrelid::regclass,
+      (
+        SELECT attname FROM pg_attribute WHERE attrelid = c.conrelid AND attnum = c.conkey[1]
+      ) as pk
+    FROM pg_constraint c
+    WHERE contype = 'p'
     AND connamespace::regnamespace::text NOT IN ('sde')`)
         .then((el) => el.rows || []);
     const pk = pks.reduce((acc, curr) => ({
@@ -40,36 +40,36 @@ async function init(client) {
             : curr.conrelid]: curr.pk,
     }), {});
     const tlist = await client
-        .query(`SELECT
-        array_agg(
-          (
-            SELECT
-              nspname
-            FROM
-              pg_namespace
-            WHERE
-              oid = relnamespace
-          ) || '.' || relname
-        ) tlist
-      FROM
-        pg_class
-      WHERE
+        .query(`SELECT
+        array_agg(
+          (
+            SELECT
+              nspname
+            FROM
+              pg_namespace
+            WHERE
+              oid = relnamespace
+          ) || '.' || relname
+        ) tlist
+      FROM
+        pg_class
+      WHERE
         relkind IN ('r', 'v', 'm')`)
         .then((d) => d.rows[0].tlist);
     const rows = await client
-        .query(`SELECT
-      (
-        SELECT
-          nspname
-        FROM
-          pg_namespace
-        WHERE
-          oid = relnamespace
-      ) || '.' || relname AS tname,
-      relkind
-    FROM
-      pg_class
-    WHERE
+        .query(`SELECT
+      (
+        SELECT
+          nspname
+        FROM
+          pg_namespace
+        WHERE
+          oid = relnamespace
+      ) || '.' || relname AS tname,
+      relkind
+    FROM
+      pg_class
+    WHERE
       relkind IN ('r', 'v', 'm')`)
         .then((el) => el.rows || []);
     const relkinds = rows.reduce((acc, curr) => Object.assign(acc, { [curr.tname]: curr.relkind }), {});