@opengis/fastify-table 2.0.113 → 2.0.115

package/dist/module/core/pt/schemaItem.pt.hbs

@@ -11,7 +11,7 @@ CREATE TABLE if not exists {{nspname}}.{{relname}}
   {{column_name}} {{data_type}} {{#unless is_nullable}}NOT NULL{{/unless}}{{#if column_default}}DEFAULT {{column_default}}{{/if}}{{#ifCond @index '!=' (_math ../columns.length '-' 1)}},{{/ifCond}} -- {{{coalesce description '-'}}}
   {{/each}}{{#if constraints.length}},{{/if}}
   {{#each constraints}}
-  CONSTRAINT {{constraint_name}} {{#ifCond constraint_type '==' 'f'}}FOREIGN KEY ({{foreign_column}}) REFERENCES {{foreign_table}} ({{foreign_column}}) MATCH {{select confmatchtype data="constraint_matchtype"}} ON UPDATE {{select confupdtype data="constraint_action"}} ON DELETE {{select confdeltype data="constraint_action"}}{{^}}{{select constraint_type data="constraint_type_full"}} ({{column_name}}){{/ifCond}}{{#ifCond @index '!=' (_math ../constraints.length '-' 1)}},{{/ifCond}}
+  CONSTRAINT {{constraint_name}} {{#ifCond constraint_type '==' 'c'}} {{check_definition}} {{/ifCond}} {{#ifCond constraint_type '==' 'f'}}FOREIGN KEY ({{foreign_column}}) REFERENCES {{foreign_table}} ({{foreign_column}}) MATCH {{select confmatchtype data="constraint_matchtype"}} ON UPDATE {{select confupdtype data="constraint_action"}} ON DELETE {{select confdeltype data="constraint_action"}}{{^}}{{select constraint_type data="constraint_type_full"}} ({{column_name}}){{/ifCond}}{{#ifCond @index '!=' (_math ../constraints.length '-' 1)}},{{/ifCond}}
   {{/each}}
 );
 

package/dist/script/dump.js

@@ -115,7 +115,8 @@ async function schemaItem({ pg, table, schema, debug, }) {
         throw new Error("invalid params");
     const { rows: constraints } = await pg.query(`select con.conrelid::regclass as constraint_table, a.column_name,
     con.conname as constraint_name,contype as constraint_type, con.confrelid::regclass as foreign_table, 
-    con.confupdtype, con.confdeltype, con.confmatchtype, u.column_name as foreign_column from pg_constraint con
+    con.confupdtype, con.confdeltype, con.confmatchtype, u.column_name as foreign_column,
+    case when contype='c' then pg_get_constraintdef(con.oid, true) else null end AS check_definition from pg_constraint con
     left join pg_class c ON c.oid = con.conrelid              
     left join pg_namespace n ON n.oid = c.relnamespace
     left join lateral (
@@ -136,7 +137,14 @@ async function schemaItem({ pg, table, schema, debug, }) {
             Object.assign(col, { constraint_type });
         });
         // table relations
-        const tableConstraints = constraints?.filter((el) => el?.constraint_table === `${row.nspname}.${row.relname}`);
+        const tableConstraints = constraints
+            ?.filter((el) => el?.constraint_table === `${row.nspname}.${row.relname}`)
+            ?.map((el) => ({
+            ...el,
+            check_definition: el.check_definition
+                ? new handlebars.SafeString(el.check_definition)
+                : null,
+        }));
         Object.assign(row, { constraints: tableConstraints });
     });
     if (debug)

package/dist/script/dump.ts

@@ -156,7 +156,8 @@ async function schemaItem({
   const { rows: constraints } =
     await pg.query(`select con.conrelid::regclass as constraint_table, a.column_name,
     con.conname as constraint_name,contype as constraint_type, con.confrelid::regclass as foreign_table, 
-    con.confupdtype, con.confdeltype, con.confmatchtype, u.column_name as foreign_column from pg_constraint con
+    con.confupdtype, con.confdeltype, con.confmatchtype, u.column_name as foreign_column,
+    case when contype='c' then pg_get_constraintdef(con.oid, true) else null end AS check_definition from pg_constraint con
     left join pg_class c ON c.oid = con.conrelid              
     left join pg_namespace n ON n.oid = c.relnamespace
     left join lateral (
@@ -185,9 +186,16 @@ async function schemaItem({
     });
 
     // table relations
-    const tableConstraints = constraints?.filter(
-      (el: any) => el?.constraint_table === `${row.nspname}.${row.relname}`
-    );
+    const tableConstraints = constraints
+      ?.filter(
+        (el: any) => el?.constraint_table === `${row.nspname}.${row.relname}`
+      )
+      ?.map((el: any) => ({
+        ...el,
+        check_definition: el.check_definition
+          ? new handlebars.SafeString(el.check_definition)
+          : null,
+      }));
     Object.assign(row, { constraints: tableConstraints });
   });
 

package/dist/script/migrate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../script/migrate.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,OAAO,UAAU,OAAO,SAiB9B"}
+{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../script/migrate.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,OAAO,UAAU,OAAO,SAuB9B"}

package/dist/script/migrate.js

@@ -1,6 +1,9 @@
+import path from "node:path";
 import Fastify from "fastify";
 import config from "../config.js";
 import plugin from "../index.js";
+import execMigrations from "../server/plugins/migration/exec.migrations.js";
+import pgClients from "../server/plugins/pg/pgClients.js";
 const timeoutMs = +(config.migrationTimeout || 5000);
 const port = process.env.PORT || config.port || 3000;
 if (import.meta.main) {
@@ -11,6 +14,7 @@ export default function migrate() {
     app.register(plugin, config);
     app.listen({ host: "0.0.0.0", port }, (err) => {
         console.log(`Server started via port: ${port}`);
+        execMigrations(path.join(process.cwd(), "server/migrations"), pgClients.client).catch((err) => console.error(err.toString()));
         setTimeout(() => {
             console.log("Server closed after timeout", timeoutMs);
             app.close();

package/dist/script/migrate.ts

@@ -1,8 +1,12 @@
+import path from "node:path";
 import Fastify from "fastify";
 
 import config from "../config.js";
 import plugin from "../index.js";
 
+import execMigrations from "../server/plugins/migration/exec.migrations.js";
+import pgClients from "../server/plugins/pg/pgClients.js";
+
 const timeoutMs = +(config.migrationTimeout || 5000);
 
 const port = process.env.PORT || config.port || 3000;
@@ -18,6 +22,12 @@ export default function migrate() {
 
   app.listen({ host: "0.0.0.0", port }, (err: any) => {
     console.log(`Server started via port: ${port}`);
+
+    execMigrations(
+      path.join(process.cwd(), "server/migrations"),
+      pgClients.client
+    ).catch((err) => console.error(err.toString()));
+
     setTimeout(() => {
       console.log("Server closed after timeout", timeoutMs);
       app.close();

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":"AA+DA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAmXzD"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AA+DA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAqXzD"}

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

@@ -231,9 +231,8 @@ export default async function suggest(req, reply) {
     }
     // query
     const { rows: dataNew } = await pg.query(sqlSuggest, query.key ? [query.key.toLowerCase()] : []);
-    // const { rows: dataNew1 } = dataNew.length < limit ? await pg.query(sqlSuggest, query.key ? [`${query.key}`] : []) : {};
-    // const ids = dataNew.map((el) => el.id);
-    const data = dataNew.filter((el) => el.id && el.text);
+    // in case id / text = Boolean
+    const data = dataNew.filter((el) => Object.hasOwn(el, "id") && Object.hasOwn(el, "text"));
     if (tableName && column) {
         const { name = query.sel || column, type = "select" } = getColumnCLS(tableName, column) || {};
         await metaFormat({

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

@@ -231,7 +231,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     const fData = checkFilter
         ? await getFilterSQL({
             pg,
-            table: loadTable ? paramsTable : table1,
+            table: loadTable ? tokenData?.table || paramsTable : table1,
             filter: query?.filter,
             search: query?.search,
             state: query?.state,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.0.113",
+  "version": "2.0.115",
   "type": "module",
   "description": "core-plugins",
   "keywords": [
@@ -21,8 +21,10 @@
     "dist/*"
   ],
   "scripts": {
-    "dump": "bun ./dist/script/dump.js",
-    "migrate": "MIGRATE=true bun ./dist/script/migrate.js",
+    "dump": "bun ./script/dump.ts",
+    "migrate": "MIGRATE=true bun ./script/migrate.ts",
+    "dump1": "bun ./dist/script/dump.js",
+    "migrate1": "MIGRATE=true bun ./dist/script/migrate.js",
     "prepublishOnly": "npm run build",
     "clean": "tsc -b --clean",
     "build": "tsc -b --clean && tsc && copyfiles server/plugins/grpc/utils/*.proto dist && copyfiles server/migrations/*.sql dist && copyfiles server/templates/**/*.html dist && copyfiles server/templates/**/*.hbs dist && copyfiles script/* dist && copyfiles -u 2 module/core/*/* dist/module/core",