@opengis/fastify-table 2.4.19 → 2.5.1

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

@@ -54,13 +54,11 @@ function getOrder(queryOrder, queryDesc, defaultOrder, columnList, sqlColumns, i
 const checkInline = {};
 const maxLimit = 100;
 const defaultLimit = 20;
-export default async function dataAPI({ pg = pgClients.client, params, table, id, headers = {}, query = {}, user = {}, contextQuery, searchColumn, sufix = true, filterList, actions: actionsParam, accessQuery: accessQueryParam, columns: columnsParam, isExport = false, }, reply1, called) {
+export default async function dataAPI({ pg = pgClients.client, params, table, id, headers = {}, query = {}, user = {}, contextQuery, searchColumn, sufix = true, filterList, actions: actionsParam, accessQuery: accessQueryParam, columns: columnsParam, isExport = false, }, reply, called) {
     const time = Date.now();
     const timeArr = [Date.now()];
     const { uid } = user;
-    const reply = reply1 || mockReply;
     const method = "GET";
-    const checkQuery = (item) => user?.user_type === "superadmin" ? !item.includes("{{uid}}") : true;
     const paramsTable = params?.table || table;
     if (!paramsTable) {
         throw BadRequestError("not enough params: table");
@@ -210,14 +208,14 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         !el.inline &&
         el?.sql?.replace &&
         !(isExport && el.export === false))
-        .map((el, i) => ` left join lateral (${el.sql.replace("{{uid}}", uid)}) ${el.name || `t${i}`} on 1=1 `)
+        .map((el, i) => ` left join lateral (${el.sql.replace("{{uid}}", `$${idx.uid}`)}) ${el.name || `t${i}`} on 1=1 `)
         ?.join("") || "";
     const cardSqlFiltered = objectId
         ? cardSql?.filter?.((el) => !el?.disabled && el?.name && el?.sql?.replace) || []
         : [];
     const cardSqlTable = cardSqlFiltered.length
         ? cardSqlFiltered
-            .map((el, i) => ` left join lateral (${el.sql.replace("{{uid}}", uid)}) ct${i}  on 1=1 `)
+            .map((el, i) => ` left join lateral (${el.sql.replace("{{uid}}", `$${idx.uid}`)}) ct${i}  on 1=1 `)
             .join("\n") || ""
         : "";
     const sqlInline = loadTable?.sql
@@ -277,21 +275,40 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     const keyQuery = query?.key && (loadTable?.key || tokenData?.key) && !objectId
         ? `${loadTable?.key || tokenData?.key}=$1`
         : null;
+    const idx = {};
+    const args = (objectId ? [objectId] : null) ||
+        (query?.key && loadTable.key ? [query.key] : []);
+    if (args[0]) {
+        Object.assign(idx, { id: 1 });
+    }
+    const isSingle = !!idx.id;
     const limit = (called
         ? query?.limit || defaultLimit
         : Math.min(maxLimit, +(query?.limit || defaultLimit))) || defaultLimit;
-    const offset = query?.page && query?.page > 0 && !objectId
-        ? ` offset ${(query?.page - 1) * limit}`
-        : "";
+    args.push(limit);
+    Object.assign(idx, { limit: idx.id ? 2 : 1 });
+    const offset = query?.page && query?.page > 0 && !objectId ? (query?.page - 1) * limit : 0;
+    args.push(offset);
+    Object.assign(idx, { offset: idx.id ? 3 : 2 });
     const order = getOrder(query?.order, query?.desc, loadTable?.order, columnList, loadTable?.sqlColumns, !!called);
+    const isSearchable = Array.isArray(loadTable?.meta?.search) &&
+        loadTable.meta.search.length &&
+        query?.search &&
+        !isSingle;
+    if (isSearchable) {
+        args.push(`%${query.search.replace(/%/g, "\\%")}%`);
+        Object.assign(idx, { search: Object.keys(idx).length + 1 });
+    }
+    if (meta?.bbox && query?.polyline) {
+        args.push(query.polyline);
+        Object.assign(idx, { polyline: Object.keys(idx).length + 1 });
+    }
     if (config.trace)
         console.log(order);
-    const search = loadTable?.meta?.search && query?.search
+    const search = isSearchable
         ? `(${loadTable?.meta?.search
             ?.split(",")
-            ?.map((el) => `${el} ilike '%${query?.search
-            .replace(/%/g, "\\%")
-            .replace(/'/g, "''")}%'`)
+            ?.map((el) => `${el} ilike $${idx.search}`)
             .join(" or ")})`
         : null;
     const queryBbox = query?.bbox
@@ -301,7 +318,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             ?.map((el) => el - 0)
         : [];
     const queryPolyline = meta?.bbox && query?.polyline
-        ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline('${query?.polyline}')),${meta.bbox})`
+        ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline($${idx.polyline})),${meta.bbox})`
         : undefined;
     const bbox = meta?.bbox && queryBbox.filter((el) => !Number.isNaN(el))?.length === 4
         ? `${meta.bbox} && 'box(${queryBbox[0]} ${queryBbox[1]},${queryBbox[2]} ${queryBbox[3]})'::box2d `
@@ -318,7 +335,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         ? await handlebars.compile(params?.query)({ user, uid })
         : undefined;
     const where = [
-        objectId ? ` "${pk}" = $1` : null,
+        objectId ? ` "${pk}" = $${idx.id}` : null,
         keyQuery,
         loadTable?.query,
         tokenData?.query,
@@ -330,40 +347,36 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         queryPolyline,
         interfaceQuery,
         interfaceQuery1,
-    ]
-        .filter(Boolean)
-        .filter((el) => checkQuery(el));
-    const q = `select  ${pk ? `"${pk}" as id,` : ""} 
-                     ${objectId || query?.key
-        ? "*"
-        : columnsParam || sqlColumns || cols || "*"} 
-                     ${metaCols}
-                     ${dbColumns.filter((el) => pg.pgType?.[el.dataTypeID] === "geometry").length && !columnsParam
+    ].filter(Boolean);
+    const q1 = `select  ${pk ? `"${pk}" as id,` : ""} 
+  ${objectId || query?.key ? "*" : columnsParam || sqlColumns || cols || "*"} 
+  ${metaCols}
+  ${dbColumns.filter((el) => pg.pgType?.[el.dataTypeID] === "geometry")
+        .length && !columnsParam
         ? `,${dbColumns
             .filter((el) => pg.pgType?.[el.dataTypeID] === "geometry")
             .map((el) => `st_asgeojson("${el.name.replace(/'/g, "''")}")::json as "${el.name.replace(/'/g, "''")}"`)
             .join(",")}`
         : ""} 
-                     from (select * ${sql
+  from (select * ${sql
         ?.filter((el) => el.inline && !(isExport && el.export === false))
         .map((el) => `,(${el.sql})`)
         .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t  ${sqlTable} ) t 
                       
-                     ${objectId ? cardSqlTable : ""} 
-                     where ${where.join(" and ") || "true"} 
-                     ${order} ${offset} limit ${limit}`.replace(/{{uid}}/g, uid);
+  ${objectId ? cardSqlTable : ""} 
+  where ${where.join(" and ") || "true"} 
+  ${order} limit $${idx.limit} offset $${idx.offset}`;
+    if (q1.includes("{{uid}}")) {
+        args.push(uid || "");
+        Object.assign(idx, { uid: Object.keys(idx).length + 1 });
+    }
+    const q = q1.replace(/{{uid}}/g, `$${idx.uid}`);
     if (config.trace)
         console.log(q);
     if (query?.sql === "1") {
         return q;
     }
-    const { rows = [] } = await pg
-        .query(q, (objectId ? [objectId] : null) ||
-        (query?.key && loadTable.key ? [query?.key] : []))
-        .catch((err) => {
-        console.error(err.toString());
-        throw err;
-    });
+    const rows = await pg.query(q, args).then((r) => r.rows || []);
     if (!rows.length &&
         headers?.referer?.includes?.("/card/") &&
         headers?.referer?.includes?.(templateName)) {
@@ -395,17 +408,38 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             });
         });
     }
+    const idx1 = {};
+    const args1 = [];
+    if (idx.search) {
+        args1.push(args[idx.search - 1]);
+        Object.assign(idx1, { search: Object.keys(idx1).length + 1 });
+    }
+    if (idx.uid) {
+        args1.push(args[idx.uid - 1]);
+        Object.assign(idx1, { uid: Object.keys(idx1).length + 1 });
+    }
+    if (idx.polyline) {
+        args1.push(args[idx.polyline - 1]);
+        Object.assign(idx1, { polyline: Object.keys(idx1).length + 1 });
+    }
+    const search1 = idx.search
+        ? `(${loadTable.meta.search
+            .split(",")
+            .map((el) => `${el} ilike $${idx1.search}`)
+            .join(" or ")})`
+        : null;
+    const queryPolyline1 = idx.polyline
+        ? `ST_Contains(ST_MakePolygon(ST_LineFromEncodedPolyline($${idx1.polyline})),${meta.bbox})`
+        : undefined;
     const filterWhere = [
         fData.q,
-        search,
+        search1,
         bbox,
-        queryPolyline,
+        queryPolyline1,
         interfaceQuery,
         loadTable?.query,
         tokenData?.query,
-    ]
-        .filter(Boolean)
-        .filter((el) => checkQuery(el));
+    ].filter(Boolean);
     const aggColumns = columns
         .filter((el) => el.agg)
         .reduce((acc, curr) => Object.assign(acc, { [curr.name]: curr.agg }), {});
@@ -416,21 +450,20 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
     }))
         .filter((el) => ["numeric", "double precision"].includes(el.type) && aggColumns[el.name]);
     const qCount = `select 
-            count(*)::int as total,  
-            count(*) FILTER(WHERE ${filterWhere.join(" and ") || "true"})::int as filtered
-            ${aggregates.length
+  count(*)::int as total,  
+  count(*) FILTER(WHERE ${filterWhere.join(" and ") || "true"})::int as filtered
+  ${aggregates.length
         ? `,${aggregates
             .map((el) => `${aggColumns[el.name]}(${el.name}) FILTER(WHERE ${filterWhere.join(" and ") || "true"}) as ${el.name}`)
             .join(",")}`
         : ""}
-            from (select * ${sql
+  from (select * ${sql
         ?.filter((el) => el.inline)
         .map((el) => `,(${el.sql})`)
         .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t ${sqlTable})t 
-            where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery]
+  where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery]
         .filter(Boolean)
-        .filter((el) => checkQuery(el))
-        .join(" and ") || "true"} `.replace(/{{uid}}/g, uid);
+        .join(" and ") || "true"} `.replace(/{{uid}}/g, `$${idx1.uid}`);
     if (query?.sql === "2") {
         return qCount;
     }
@@ -438,6 +471,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         ? { total: rows.length, filtered: rows.length }
         : await pg
             .queryCache?.(qCount, {
+            args: args1,
             table: loadTable?.table || tokenData?.table,
             time: 5,
         })

package/dist/server/routes/table/index.js

@@ -32,7 +32,8 @@ function plugin(app, opt = {}) {
         },
         schema: suggestSchema,
     }, suggest);
-    app.get("/data/:table/:id?", { config: { tags, policy }, schema: tableSchema }, data);
+    app.get("/data/:table/:id?", { config: { tags, policy, allowSql: true }, schema: tableSchema }, // query.polyline support w/ allowSql
+    data);
     app.get("/table-data/:table", { config: { tags, auth: "creds", policy: "L2" }, schema: tableDataSchema }, data);
     app.get("/table-data/:table/:id", { config: { tags, policy }, schema: tableDataIdSchema }, cardData);
     app.get("/data-info/:id?", { config: { tags, policy }, schema: tableSchema }, dataInfo);

package/dist/server/routes/table/schema.d.ts

@@ -4,11 +4,11 @@ declare const tableDataSchema: {
         querystring: {
             limit: {
                 type: string;
-                pattern: string;
+                minimum: number;
             };
             page: {
                 type: string;
-                pattern: string;
+                minimum: number;
             };
             order: {
                 type: string;
@@ -36,7 +36,6 @@ declare const tableDataSchema: {
             };
             sql: {
                 type: string;
-                pattern: string;
             };
         };
         params: {
@@ -57,11 +56,11 @@ declare const tableSchema: {
         querystring: {
             limit: {
                 type: string;
-                pattern: string;
+                minimum: number;
             };
             page: {
                 type: string;
-                pattern: string;
+                minimum: number;
             };
             order: {
                 type: string;
@@ -85,7 +84,6 @@ declare const tableSchema: {
             };
             sql: {
                 type: string;
-                pattern: string;
             };
         };
         params: {
@@ -106,11 +104,11 @@ declare const searchSchema: {
         querystring: {
             page: {
                 type: string;
-                pattern: string;
+                minimum: number;
             };
             limit: {
                 type: string;
-                pattern: string;
+                minimum: number;
             };
             order: {
                 type: string;
@@ -161,11 +159,9 @@ declare const suggestSchema: {
             };
             sql: {
                 type: string;
-                pattern: string;
             };
             count: {
                 type: string;
-                pattern: string;
             };
         };
         params: {};

package/dist/server/routes/table/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../server/routes/table/schema.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsBpB,CAAC;AAEF,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuBhB,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAajB,CAAC;AAEF,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiBlB,CAAC;AAEF,QAAA,MAAM,UAAU;;;;;;;;;;;;;;CAQf,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;CAOjB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;CAUtB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;CAQtB,CAAC;AAEF,OAAO,EACL,eAAe,EAAE,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,iBAAiB,GAC1H,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../server/routes/table/schema.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsBpB,CAAC;AAEF,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuBhB,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAajB,CAAC;AAEF,QAAA,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiBlB,CAAC;AAEF,QAAA,MAAM,UAAU;;;;;;;;;;;;;;CAQf,CAAC;AAEF,QAAA,MAAM,YAAY;;;;;;;;;;CAOjB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;CAUtB,CAAC;AAEF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;CAQtB,CAAC;AAEF,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,YAAY,EACZ,aAAa,EACb,UAAU,EACV,YAAY,EACZ,iBAAiB,GAClB,CAAC"}

package/dist/server/routes/table/schema.js

@@ -1,76 +1,76 @@
 const tableDataSchema = {
-    type: 'object',
+    type: "object",
     properties: {
         querystring: {
-            limit: { type: 'string', pattern: '^(\\d+)$' },
-            page: { type: 'string', pattern: '^(\\d+)$' },
+            limit: { type: "number", minimum: 1 },
+            page: { type: "number", minimum: 1 },
             // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
             // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-            order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            desc: { type: 'string', pattern: '^(\\d+)$' },
-            state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-            custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-            bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
-            polyline: { type: 'string', pattern: '^([\\d\\w|@{}~_`]+)$' },
+            order: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
+            desc: { type: "string", pattern: "^(\\d+)$" },
+            state: { type: "string", pattern: "^([\\d\\w._-]+)$" },
+            custom: { type: "string", pattern: "^([\\d\\w._-]+)$" },
+            bbox: { type: "string", pattern: "^([\\d\\s,.-]+)$" },
+            polyline: { type: "string", pattern: "^([\\d\\w|@{}~_`]+)$" },
             // key: { type: 'string', pattern: '^([\\d\\w_]+)$' },
-            sql: { type: 'string', pattern: '^(\\d)$' },
+            sql: { type: "number" },
         },
         params: {
-            id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+            id: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
+            table: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
         },
     },
 };
 const tableSchema = {
-    type: 'object',
+    type: "object",
     properties: {
         querystring: {
-            limit: { type: 'string', pattern: '^(\\d+)$' },
-            page: { type: 'string', pattern: '^(\\d+)$' },
+            limit: { type: "number", minimum: 1 },
+            page: { type: "number", minimum: 1 },
             // filter: { type: 'string', pattern: '^([\\w\\d_-]+)=([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
             // search: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s\\/\\[\\]\\(\\)\\{\\}\\|,.!?;:—_=-@%#$&^*+=`~]+)$' },
-            order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            desc: { type: 'string', pattern: '^(\\d+)$' },
+            order: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
+            desc: { type: "string", pattern: "^(\\d+)$" },
             // state: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
             // custom: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
-            bbox: { type: 'string', pattern: '^([\\d\\s,.-]+)$' },
+            bbox: { type: "string", pattern: "^([\\d\\s,.-]+)$" },
             // polyline: { type: 'string', pattern: '^([\\d\\w\\|@\\/\\{\\}~_`]+)$' },
-            key: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$' },
-            uid: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            sql: { type: 'string', pattern: '^(\\d)$' },
+            key: { type: "string", pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$" },
+            uid: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
+            sql: { type: "number" },
         },
         params: {
-            id: { type: 'string', pattern: '^([\\d\\w]+)$' },
-            table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+            id: { type: "string", pattern: "^([\\d\\w]+)$" },
+            table: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
         },
     },
 };
 const searchSchema = {
-    type: 'object',
+    type: "object",
     properties: {
         querystring: {
-            page: { type: 'string', pattern: '^(\\d+)$' },
-            limit: { type: 'string', pattern: '^(\\d+)$' },
-            order: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            desc: { type: 'string', pattern: '^(\\d+)$' },
-            key: { type: 'string', pattern: '^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$' },
-            table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            sql: { type: 'string', pattern: '^(\\d)$' },
+            page: { type: "number", minimum: 1 },
+            limit: { type: "number", minimum: 1 },
+            order: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
+            desc: { type: "string", pattern: "^(\\d+)$" },
+            key: { type: "string", pattern: "^([А-Яа-яҐґЄєІіЇї\\d\\w\\s_.-]+)$" },
+            table: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
+            sql: { type: "string", pattern: "^(\\d)$" },
         },
     },
 };
 const suggestSchema = {
-    type: 'object',
+    type: "object",
     properties: {
         querystring: {
-            lang: { type: 'string', pattern: '^([\\w]+)$' },
-            parent: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            sel: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            name: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+            lang: { type: "string", pattern: "^([\\w]+)$" },
+            parent: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
+            sel: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
+            name: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
             // key: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            val: { type: 'string', pattern: '([\\d\\w]+)$' },
-            sql: { type: 'string', pattern: '^(\\d)$' },
-            count: { type: 'string', pattern: '^(\\d)$' },
+            val: { type: "string", pattern: "([\\d\\w]+)$" },
+            sql: { type: "number" },
+            count: { type: "number" },
         },
         params: {
         //  data: { type: 'string', pattern: '^([\\d\\w]+)$' },
@@ -78,39 +78,39 @@ const suggestSchema = {
     },
 };
 const formSchema = {
-    type: 'object',
+    type: "object",
     properties: {
         params: {
-            name: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+            name: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
+            id: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
         },
     },
 };
 const filterSchema = {
-    type: 'object',
+    type: "object",
     properties: {
         params: {
-            table: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
+            table: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
         },
     },
 };
 const cardTabDataSchema = {
-    type: 'object',
+    type: "object",
     properties: {
         querystring: {
-            sql: { type: 'string', pattern: '^(\\d)$' },
+            sql: { type: "string", pattern: "^(\\d)$" },
         },
         params: {
-            token: { type: 'string', pattern: '^([\\d\\w]+)$' },
+            token: { type: "string", pattern: "^([\\d\\w]+)$" },
         },
     },
 };
 const tableDataIdSchema = {
-    type: 'object',
+    type: "object",
     properties: {
         params: {
-            id: { type: 'string', pattern: '^([\\d\\w_.-]+)$' },
-            name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+            id: { type: "string", pattern: "^([\\d\\w_.-]+)$" },
+            name: { type: "string", pattern: "^([\\d\\w._-]+)$" },
         },
     },
 };

package/dist/server/routes/templates/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/templates/index.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAMpD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/templates/index.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,GAAE,GAAQ,QAQpD"}

package/dist/server/routes/templates/index.js

@@ -3,5 +3,11 @@ import { getTemplateSchema } from "./schema.js";
 const policy = "L0";
 const tags = ["core", "templates"];
 export default function route(app, opt = {}) {
-    app.get("/template/:type/:name", { config: { tags, policy }, schema: getTemplateSchema }, getTemplateApi);
+    app.route({
+        method: "GET",
+        url: "/template/:type/:name",
+        config: { tags, policy },
+        schema: getTemplateSchema,
+        handler: getTemplateApi,
+    });
 }

package/dist/server/routes/templates/schema.d.ts

@@ -1,7 +1,7 @@
 declare const getTemplateSchema: {
-    type: string;
-    properties: {
-        params: {
+    params: {
+        type: string;
+        properties: {
             name: {
                 type: string;
                 pattern: string;

package/dist/server/routes/templates/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../server/routes/templates/schema.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,iBAAiB;;;;;;;;;;CAQtB,CAAC;;AAEF,wBAAoB;AACpB,OAAO,EAAE,iBAAiB,EAAE,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../server/routes/templates/schema.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,iBAAiB;;;;;;;;;;CAQtB,CAAC;;AAEF,wBAAoB;AAEpB,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/server/routes/templates/schema.js

@@ -1,8 +1,8 @@
 const getTemplateSchema = {
-    type: 'object',
-    properties: {
-        params: {
-            name: { type: 'string', pattern: '^([\\d\\w._-]+)$' },
+    params: {
+        type: "object",
+        properties: {
+            name: { type: "string", pattern: "^([\\d\\w._-]+)$" },
             // type: { type: 'string' },
         },
     },

package/dist/server/types/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../server/types/core.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../server/types/core.ts"],"names":[],"mappings":"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"}

package/dist/server/types/core.js

@@ -5,7 +5,3 @@ if (execName === "bun") {
     const sqlite = await import("bun:sqlite");
     Database = sqlite.Database;
 }
-else {
-    const betterSqlite = await import("better-sqlite3");
-    Database = betterSqlite.default;
-}