@opengis/fastify-table 2.0.120 → 2.0.122

package/dist/config.js

@@ -10,7 +10,7 @@ Object.assign(config, {
     storageList: {},
     allTemplates: config?.allTemplates || {},
     env: process.env.NODE_ENV,
-    port: process.env.PORT,
+    port: config.port || process.env.PORT,
 });
 if (existsSync(`.env.local`)) {
     dotenv.config({ path: `.env.local` }); // ! load .env.local

package/dist/server/plugins/logger/createFileStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createFileStream.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/createFileStream.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,yBAAyB,CAAC;AAoC5C,MAAM,CAAC,OAAO,UAAU,eAAe,iDAoDtC"}
+{"version":3,"file":"createFileStream.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/createFileStream.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,yBAAyB,CAAC;AAmC5C,MAAM,CAAC,OAAO,UAAU,eAAe,iDAoDtC"}

package/dist/server/plugins/table/funcs/getSelectMeta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSelectMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelectMeta.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWzD,wBAA8B,aAAa,CAAC,EAC1C,IAAI,EACJ,UAAU,EACV,GAAG,EACH,OAAO,EACP,MAAM,EACN,EAAqB,GACtB,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB,gBA4GA"}
+{"version":3,"file":"getSelectMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelectMeta.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAWzD,wBAA8B,aAAa,CAAC,EAC1C,IAAI,EACJ,UAAU,EACV,GAAG,EACH,OAAO,EACP,MAAM,EACN,EAAqB,GACtB,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB,gBA8GA"}

package/dist/server/plugins/table/funcs/getSelectMeta.js

@@ -17,7 +17,9 @@ export default async function getSelectMeta({ name, startsWith, key, nocache, pa
     }
     const cls = await getSelect(name, pg, nocache);
     const db = typeof cls?.db === "string" ? { database: cls.db } : cls?.db;
-    const pg1 = cls?.db ? await getPGAsync(db) : pg;
+    const pg1 = cls?.db
+        ? await getPGAsync({ database: db, port: cls?.port })
+        : pg;
     if (!cls)
         return null;
     if (cls.arr)

package/dist/server/plugins/usercls/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/usercls/index.ts"],"names":[],"mappings":"AAMA,wBAAsB,YAAY,CAChC,EACE,IAAI,EACJ,WAAW,EACX,KAAK,EACL,KAAK,EACL,GAAG,EACH,IAAS,GACV,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE;QACJ,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,EAAE,CAAC;CACL,EACD,EAAE,MAAmB,mBA8EtB;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAmB,mBAUtE;AAED,wBAAsB,UAAU,CAC9B,EACE,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,WAAW,GACZ,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC,EACD,EAAE,MAAmB,mBAkDtB;AAED,wBAAsB,WAAW,CAC/B,EACE,IAAI,EACJ,KAAK,EACL,WAAW,EACX,IAAI,GACL,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC,EACD,EAAE,MAAmB,mBAKtB;AAED,wBAAsB,cAAc,CAClC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,GAAG,CAAA;CAAE,EACpE,EAAE,MAAmB,gBA+BtB;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAmB;;;;;UAsBnE;;AAED,wBAAoB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/usercls/index.ts"],"names":[],"mappings":"AAMA,wBAAsB,YAAY,CAChC,EACE,IAAI,EACJ,WAAW,EACX,KAAK,EACL,KAAK,EACL,GAAG,EACH,IAAS,GACV,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE;QACJ,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,EAAE,CAAC;CACL,EACD,EAAE,MAAmB,mBA8EtB;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAmB,mBAUtE;AAED,wBAAsB,UAAU,CAC9B,EACE,IAAI,EACJ,KAAK,EACL,IAAI,EACJ,WAAW,GACZ,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC,EACD,EAAE,MAAmB,mBAkDtB;AAED,wBAAsB,WAAW,CAC/B,EACE,IAAI,EACJ,KAAK,EACL,WAAW,EACX,IAAI,GACL,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACtC,EACD,EAAE,MAAmB,mBAKtB;AAED,wBAAsB,cAAc,CAClC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,GAAG,CAAA;CAAE,EACpE,EAAE,MAAmB,gBA8BtB;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAmB;;;;;UAsBnE;;AAED,wBAAoB"}

package/dist/server/plugins/usercls/index.js

@@ -121,27 +121,23 @@ export async function editUserCls({ name, alias, description, data, }, pg = pgCl
     return "ok";
 }
 export async function getUserClsList({ name, search, sql }, pg = pgClients.client) {
-    const args = [];
-    const where = Object.entries({ name, search })
-        .filter((el) => el[1])
-        .reduce((acc, curr, idx) => {
-        args.push(curr[0] === "name" ? curr[1]?.split(",") : curr[1]);
-        return [
-            acc,
-            {
-                name: `name=any($${idx + 1}::text[])`,
-                search: `name in (select parent from admin.user_cls where name ilike '%'||$${idx + 1}||'%')`,
-            }[curr[0]],
-        ]
-            .filter(Boolean)
-            .join(" and ");
-    }, "1=1");
-    const q = `select name, type, description, alias, (select count(*) filter(where ${search
-        ? `name ilike '%'||$${where.match(/\$\d/g)?.length || 0}||'%'`
-        : "true"}) from admin.user_cls where parent=t.name) as count from admin.user_cls t where parent is null and ${where}`;
+    const args = name ? [name.split(",")] : [search];
+    const where = name
+        ? "name=any($1::text[])"
+        : `( name ilike '%'||$1||'%' or name in (select parent from admin.user_cls where name ilike '%'||$1||'%') )`;
+    const q = `select true as custom, name, type, description, alias, (select count(*) filter(where ${search ? `name ilike '%'||$1||'%'` : "true"}) from admin.user_cls where parent=t.name limit 1) as count from admin.user_cls t where parent is null and ${where}
+  
+    union all
+  
+    select false as custom, name, type, null as description, null as alias, (select count(*) filter(where ${search ? `name ilike '%'||$1||'%'` : "true"}) from admin.cls where parent=t.name limit 1) as count from admin.cls t where parent is null and ${where}
+    
+    order by name`;
     if (sql)
         return q;
-    const rows = await pg.query(q, args).then((el) => el.rows || []);
+    const rows1 = await pg.query(q, args).then((el) => el.rows || []);
+    const customRows = rows1.filter((row) => row.custom);
+    const customClsNames = customRows.map((row) => row.name);
+    const rows = customRows.concat(rows1.filter((row) => !customClsNames.includes(row.name)));
     return rows;
 }
 export async function getUserCls(name, pg = pgClients.client) {

package/dist/server/routes/usercls/controllers/editUserCls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/editUserCls.ts"],"names":[],"mappings":"AAWA,wBAA8B,cAAc,CAC1C,EAAE,EAAqB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EAClD,KAAK,EAAE,GAAG,gBAmCX"}
+{"version":3,"file":"editUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/editUserCls.ts"],"names":[],"mappings":"AAUA,wBAA8B,cAAc,CAC1C,EAAE,EAAqB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,EAClD,KAAK,EAAE,GAAG,gBAsCX"}

package/dist/server/routes/usercls/controllers/editUserCls.js

@@ -3,23 +3,23 @@ import getSelectMeta from "../../../plugins/table/funcs/getSelectMeta.js";
 import { addUserCls, addCustomCls, editUserCls, getUserCls, } from "../../../plugins/usercls/index.js";
 export default async function editUserClsApi({ pg = pgClients.client, body, params, user }, reply) {
     const { name } = params;
-    const { data, table } = body;
+    const { data, table, description, alias } = body;
     const t1 = Date.now();
     if (!user?.uid) {
         return reply.status(401).send({ error: "unauthorized", code: 401 });
     }
     if (table) {
-        await addCustomCls({ name, data, table, uid: user.uid }, pg);
+        await addCustomCls({ name, data, description, alias, table, uid: user.uid }, pg);
         return reply
             .status(200)
             .send({ time: Date.now() - t1, name, type: "custom" });
     }
     const exists = await getUserCls(name, pg);
     if (exists) {
-        await editUserCls({ name, data }, pg);
+        await editUserCls({ name, data, description, alias }, pg);
     }
     else {
-        await addUserCls({ name, data }, pg);
+        await addUserCls({ name, data, description, alias }, pg);
     }
     // refresh metadata to avoid suggest API cache
     const test = await getSelectMeta({

package/dist/server/routes/usercls/controllers/getUserCls.js

@@ -1,7 +1,8 @@
+import config from "../../../../config.js";
 import pgClients from "../../../plugins/pg/pgClients.js";
 import { getUserClsList } from "../../../plugins/usercls/index.js";
 export default async function getUserClsListApi({ query, user, pg = pgClients.client }, reply) {
-    if (!user?.uid) {
+    if (!user?.uid && !config.local) {
         return reply.status(401).send({ error: "unauthorized", code: 401 });
     }
     const t1 = Date.now();

package/package.json

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