@opengis/fastify-table 2.0.124 → 2.0.125

package/dist/script/dump.d.ts

@@ -1,2 +1,2 @@
-export default function dumpMigrateSQL(): Promise<null | undefined>;
+export default function dumpMigrateSQL(): Promise<null>;
 //# sourceMappingURL=dump.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dump.d.ts","sourceRoot":"","sources":["../../script/dump.ts"],"names":[],"mappings":"AAqBA,wBAA8B,cAAc,8BA6D3C"}
+{"version":3,"file":"dump.d.ts","sourceRoot":"","sources":["../../script/dump.ts"],"names":[],"mappings":"AAqBA,wBAA8B,cAAc,kBAgE3C"}

package/dist/script/dump.js

@@ -6,14 +6,14 @@ import path from "node:path";
 import { existsSync } from "node:fs";
 import { mkdir, writeFile, rm } from "node:fs/promises";
 import { config, handlebars, pgClients, getTemplate } from "../utils.js";
-import { build, teardown } from "../helper.js";
+import { build } from "../helper.js";
 if (import.meta.main) {
     dumpMigrateSQL();
 }
 const debug = false;
 export default async function dumpMigrateSQL() {
     const app = await build();
-    app.addHook("onClose", async () => teardown());
+    // app.addHook("onClose", async () => teardown());
     try {
         // const { database, host, port, user, password } = config.pg;
         if (!config.pg) {
@@ -52,12 +52,15 @@ export default async function dumpMigrateSQL() {
         }
         const filepath = await saveFile(dump, tableName || schemaName || "");
         console.log("success", filepath);
+        // app.close();
     }
     catch (err) {
         console.error(err);
+        // app.close();
     }
     finally {
-        app.close();
+        await app.close();
+        process.exit(0);
     }
 }
 async function saveFile(data, filename) {

package/dist/script/dump.ts

@@ -21,7 +21,7 @@ const debug = false;
 
 export default async function dumpMigrateSQL() {
   const app = await build();
-  app.addHook("onClose", async () => teardown());
+  // app.addHook("onClose", async () => teardown());
 
   try {
     // const { database, host, port, user, password } = config.pg;
@@ -75,10 +75,13 @@ export default async function dumpMigrateSQL() {
 
     const filepath = await saveFile(dump, tableName || schemaName || "");
     console.log("success", filepath);
+    // app.close();
   } catch (err) {
     console.error(err);
+    // app.close();
   } finally {
-    app.close();
+    await app.close();
+    process.exit(0);
   }
 }
 

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

@@ -26,10 +26,12 @@ export declare function editUserCls({ name, alias, description, data, }: {
     alias?: string[];
     data: string | Record<string, any>[];
 }, pg?: any): Promise<string>;
-export declare function getUserClsList({ name, search, sql }: {
+export declare function getUserClsList({ name, search, sql, custom, type, }: {
     name?: string;
     search?: string;
     sql?: any;
+    custom?: string;
+    type?: string;
 }, pg?: any): Promise<any>;
 export declare function getUserCls(name: string, pg?: any): Promise<{
     type: any;

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,gBAiCtB;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,EACE,IAAI,EACJ,MAAM,EACN,GAAG,EACH,MAAM,EACN,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,EACD,EAAE,MAAmB,gBA6CtB;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,MAAmB;;;;;UAsBnE;;AAED,wBAAoB"}

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

@@ -120,19 +120,27 @@ export async function editUserCls({ name, alias, description, data, }, pg = pgCl
     await addUserCls({ name, alias, description, data }, pg);
     return "ok";
 }
-export async function getUserClsList({ name, search, sql }, pg = pgClients.client) {
+export async function getUserClsList({ name, search, sql, custom, type, }, pg = pgClients.client) {
     const args = name ? [name.split(",")] : [search].filter(Boolean);
-    const subQuery = search ? `name ilike '%'||$1||'%'` : "true";
+    const subQuery = search
+        ? `case when parent<>$1 then name ilike '%'||$1||'%' else true end`
+        : "true";
+    const typeStr = type ? { cls: "json", select: "sql" }[type] : null;
     const where = (name ? "name=any($1::text[])" : null) ||
         (search
-            ? `( ${subQuery} or name in (select parent from admin.user_cls where ${subQuery}) )`
+            ? `( name ilike '%'||$1||'%' or name in (select parent from admin.user_cls where name ilike '%'||$1||'%') )`
             : "1=1");
-    const q = `select true as custom, name, type, description, alias, (select count(*) filter(where ${subQuery}) 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 ${subQuery}) from admin.cls where parent=t.name limit 1) as count 
-  from admin.cls t where parent is null and ${where.replace(/admin.user_cls/g, "admin.cls")}
-  order by name`;
+    const customQuery = `select true as custom, name, type, description, alias, (select count(*) filter(where ${subQuery}) from admin.user_cls where parent=t.name limit 1) as count 
+  from admin.user_cls t where parent is null and ${where} and ${typeStr ? `type='${typeStr}'` : "true"}`;
+    const gitQuery = `select false as custom, name, type, null as description, null as alias, (select count(*) filter(where ${subQuery}) from admin.cls where parent=t.name limit 1) as count 
+  from admin.cls t where parent is null and ${where.replace(/admin.user_cls/g, "admin.cls")} and ${typeStr ? `type='${typeStr}'` : "true"}`;
+    const q = [
+        custom !== "0" ? customQuery : null,
+        custom !== "1" ? gitQuery : null,
+    ]
+        .filter(Boolean)
+        .join(" union all ")
+        .concat(" order by name");
     if (sql)
         return q;
     const rows = await pg.query(q, args).then((el) => el.rows || []);

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

@@ -1 +1 @@
-{"version":3,"file":"getUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/getUserCls.ts"],"names":[],"mappings":"AAKA,wBAA8B,iBAAiB,CAC7C,EAAE,KAAK,EAAE,IAAI,EAAE,EAAqB,EAAE,EAAE,GAAG,EAC3C,KAAK,EAAE,GAAG,gBAgBX"}
+{"version":3,"file":"getUserCls.d.ts","sourceRoot":"","sources":["../../../../../server/routes/usercls/controllers/getUserCls.ts"],"names":[],"mappings":"AAKA,wBAA8B,iBAAiB,CAC7C,EAAE,KAAK,EAAE,IAAI,EAAE,EAAqB,EAAE,EAAE,GAAG,EAC3C,KAAK,EAAE,GAAG,gBAsBX"}

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

@@ -6,8 +6,14 @@ export default async function getUserClsListApi({ query, user, pg = pgClients.cl
         return reply.status(401).send({ error: "unauthorized", code: 401 });
     }
     const t1 = Date.now();
-    const result = await getUserClsList({ name: query.name, search: query.search, sql: query.sql }, pg);
+    const result = await getUserClsList({
+        name: query.name,
+        search: query.search,
+        type: query.type,
+        custom: query.custom,
+        sql: query.sql,
+    }, pg);
     if (query.sql)
         return result;
-    return { time: Date.now() - t1, data: result };
+    return { time: Date.now() - t1, filtered: result.length, data: result };
 }

package/package.json

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