@devmoods/postgres-admin 0.12.0 → 0.13.1

package/dist/index.d.ts

@@ -4,13 +4,14 @@ import { createPostgres } from '@devmoods/express-extras';
 interface AdminRouterOptions {
     postgres?: ReturnType<typeof createPostgres>;
     basename?: string;
+    indexHtml?: string;
     uiOptions?: AdminUIOptions;
 }
 interface AdminUIOptions {
     title?: string;
 }
-declare function createRouter({ postgres: defaultPostgres, basename, uiOptions, }: AdminRouterOptions): express_serve_static_core.Router;
+declare function createAdminRouter({ postgres: defaultPostgres, basename, indexHtml, uiOptions, }: AdminRouterOptions): express_serve_static_core.Router;
 
-declare const admin: typeof createRouter;
+declare const admin: typeof createAdminRouter;
 
 export { admin };

package/dist/index.js

@@ -6,11 +6,11 @@ import {
   createPostgres,
   generateCsrfToken,
   joinStatements,
-  route,
   sql,
-  validateQuery
+  staticMiddleware,
+  createRouter
 } from "@devmoods/express-extras";
-import express from "express";
+import { type } from "arktype";
 
 // src/api/structure.ts
 import { NotFound, readEnv } from "@devmoods/express-extras";
@@ -85,13 +85,13 @@ function getDefault(value) {
 }
 function toJsonSchemaProperty(column) {
   const defaultValue = getDefault(column.default);
-  const type = getPrimitiveType(column.type.name);
+  const type2 = getPrimitiveType(column.type.name);
   const description = column.comment;
   if (column.arrayDimension > 0) {
     return {
       type: "array",
       title: column.name,
-      items: { type },
+      items: { type: type2 },
       default: defaultValue || [],
       description
     };
@@ -105,7 +105,7 @@ function toJsonSchemaProperty(column) {
     };
   }
   return {
-    type,
+    type: type2,
     title: column.name,
     default: defaultValue,
     description,
@@ -225,74 +225,65 @@ function counter() {
 }
 
 // src/api/app.ts
-function createRouter({
+function createAdminRouter({
   postgres: defaultPostgres,
   basename = "/admin",
+  indexHtml = "node_modules/@devmoods/postgres-admin/dist/client/_index.html",
   uiOptions = {}
 }) {
   const postgres = defaultPostgres ?? createPostgres();
-  const app = express.Router();
+  const router = createRouter();
   if (!basename.startsWith("/")) {
     throw new Error(`Option 'basename' must start with a slash /`);
   }
-  app.get(
-    "/api/tables",
-    route(async () => {
-      const { databaseName, tables } = await readTables();
-      const rowCounts = Object.fromEntries(
-        await Promise.all(
-          tables.map(async (table) => {
-            return [
-              table.tableName,
-              await postgres.get(sql`SELECT COUNT(*) FROM ${sql.identifier(table.tableName)}`).then((r) => +r.count)
-            ];
-          })
-        )
-      );
-      return {
-        databaseName,
-        tables,
-        rowCounts
-      };
-    })
+  const unknownTableRow = type(
+    "Record<string, string | number | boolean | null>"
   );
-  app.get(
-    "/api/tables/:table/suggestions/:column",
-    route(async (req) => {
-      const table = stripIdentifier(req.params.table);
-      const definition = await getTable(table);
-      const column = stripIdentifier(req.params.column);
-      if (!definition.columnNames.includes(column)) {
-        throw BadRequest(
-          `Invalid column ${column}. Must be one of: ${definition.columnNames.join(", ")}`
-        );
-      }
-      const statement = sql`
+  router.get("/api/tables", {}, async () => {
+    const { databaseName, tables } = await readTables();
+    const rowCounts = Object.fromEntries(
+      await Promise.all(
+        tables.map(async (table) => {
+          return [
+            table.tableName,
+            await postgres.get(sql`SELECT COUNT(*) FROM ${sql.identifier(table.tableName)}`).then((r) => +r.count)
+          ];
+        })
+      )
+    );
+    return {
+      databaseName,
+      tables,
+      rowCounts
+    };
+  });
+  router.get("/api/tables/:table/suggestions/:column", {}, async (req) => {
+    const table = stripIdentifier(req.params.table);
+    const definition = await getTable(table);
+    const column = stripIdentifier(req.params.column);
+    if (!definition.columnNames.includes(column)) {
+      throw BadRequest(
+        `Invalid column ${column}. Must be one of: ${definition.columnNames.join(", ")}`
+      );
+    }
+    const statement = sql`
         SELECT DISTINCT ${sql.identifier(column)}, *
         FROM ${sql.identifier(table)}
         LIMIT 500
       `;
-      return postgres.all(statement);
-    })
-  );
-  app.get(
+    return postgres.all(statement);
+  });
+  router.get(
     "/api/tables/:table",
-    validateQuery({
-      type: "object",
-      properties: {
-        order: {
-          oneOf: [
-            { type: "string" },
-            { type: "array", items: { type: "string" } }
-          ]
-        },
-        limit: { type: "number", minimum: 1, maximum: 1e3 },
-        page: { type: "number" },
-        search: { type: "string" }
-      },
-      required: []
-    }),
-    route(async (req) => {
+    {
+      query: type({
+        order: "string|string[]?",
+        limit: "string.numeric?",
+        page: "string.numeric?",
+        search: "string?"
+      })
+    },
+    async (req) => {
       const table = stripIdentifier(req.params.table);
       const orders = queryParamToArray(req.query.order);
       const limit = parseInt(req.query.limit ?? "50");
@@ -372,28 +363,26 @@ function createRouter({
       }
       statement.append(sql` LIMIT ${limit} OFFSET ${limit * (page - 1)}`);
       return await postgres.all(statement);
-    })
+    }
   );
-  app.get(
-    "/api/tables/:table/:pk",
-    route(async (req) => {
-      const table = stripIdentifier(req.params.table);
-      const definition = await getTable(table);
-      const primaryKey = definition.primaryKey;
-      if (!primaryKey) {
-        throw BadRequest(`Table ${table} has no primary key`);
-      }
-      const statement = sql`
+  router.get("/api/tables/:table/:pk", {}, async (req) => {
+    const table = stripIdentifier(req.params.table);
+    const definition = await getTable(table);
+    const primaryKey = definition.primaryKey;
+    if (!primaryKey) {
+      throw BadRequest(`Table ${table} has no primary key`);
+    }
+    const statement = sql`
         SELECT *
         FROM ${sql.identifier(table)}
         WHERE ${sql.identifier(primaryKey)} = ${req.params.pk}
       `;
-      return postgres.first(statement);
-    })
-  );
-  app.post(
+    return postgres.first(statement);
+  });
+  router.post(
     "/api/tables/:table",
-    route(async (req) => {
+    { request: unknownTableRow },
+    async (req) => {
       const table = stripIdentifier(req.params.table);
       const definition = await getTable(table);
       const primaryKey = definition.primaryKey;
@@ -406,11 +395,12 @@ function createRouter({
         ${sql.spreadInsert(data)}
       `;
       return postgres.first(statement);
-    })
+    }
   );
-  app.put(
+  router.put(
     "/api/tables/:table/:pk",
-    route(async (req) => {
+    { request: unknownTableRow },
+    async (req) => {
       const table = stripIdentifier(req.params.table);
       const pk = req.params.pk;
       const definition = await getTable(table);
@@ -440,46 +430,37 @@ function createRouter({
           RETURNING *
         `);
       });
-    })
+    }
   );
-  app.delete(
-    "/api/tables/:table/:pk",
-    route(async (req) => {
-      const table = stripIdentifier(req.params.table);
-      const pk = parseInt(req.params.pk);
-      const definition = await getTable(table);
-      const primaryKey = definition.primaryKey;
-      if (!primaryKey) {
-        throw BadRequest(`Table ${table} has no primary key`);
-      }
-      const statement = sql`
+  router.delete("/api/tables/:table/:pk", {}, async (req) => {
+    const table = stripIdentifier(req.params.table);
+    const pk = parseInt(req.params.pk);
+    const definition = await getTable(table);
+    const primaryKey = definition.primaryKey;
+    if (!primaryKey) {
+      throw BadRequest(`Table ${table} has no primary key`);
+    }
+    const statement = sql`
         DELETE FROM ${sql.identifier(table)}
         WHERE ${sql.identifier(primaryKey)} = ${pk}
       `;
-      await postgres.query(statement);
-      return 204;
-    })
-  );
-  app.use(
-    express.static(
+    await postgres.query(statement);
+    return 204;
+  });
+  router.use(
+    staticMiddleware(
       path.resolve("node_modules/@devmoods/postgres-admin/dist/client")
     )
   );
-  app.get(
-    "*",
-    route(async (req, res) => {
-      const content = await fs.readFile(
-        "node_modules/@devmoods/postgres-admin/dist/client/_index.html",
-        "utf-8"
-      );
-      return content.replace(/{{ csrf_token }}/g, generateCsrfToken(req, res)).replace(/{{ basename }}/g, basename.slice(1)).replace(/{{ title }}/g, uiOptions.title ?? "Posterboi");
-    })
-  );
-  return app;
+  router.get("*", {}, async (req, res) => {
+    const content = await fs.readFile(indexHtml, "utf-8");
+    return content.replace(/{{ csrf_token }}/g, generateCsrfToken(req, res)).replace(/{{ basename }}/g, basename.slice(1)).replace(/{{ title }}/g, uiOptions.title ?? "Posterboi");
+  });
+  return router.getRouter();
 }
 
 // src/index.ts
-var admin = createRouter;
+var admin = createAdminRouter;
 export {
   admin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/postgres-admin",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "type": "module",
   "files": [
     "dist"
@@ -12,39 +12,32 @@
     "build:server": "tsup-node src/index.ts --format esm --dts",
     "build:client": "tsc --noEmit && vite build",
     "build": "pnpm run build:client && pnpm run build:server",
-    "test": "vitest"
+    "test": "DOTENV_CONFIG_PATH=.env.test vitest"
   },
   "dependencies": {
+    "@devmoods/config": "0.2.0",
+    "@devmoods/express-extras": "0.68.0",
+    "@devmoods/fetch": "^4.2.0",
+    "@devmoods/ui": "^2.12.2",
+    "@tanstack/react-query": "^5.90.5",
+    "@types/react": "^19.2.2",
+    "@types/react-dom": "^19.2.2",
+    "@vitejs/plugin-react": "^5.0.4",
+    "@vitest/coverage-v8": "3.2.4",
+    "arktype": "^2.1.23",
+    "babel-plugin-react-compiler": "1.0.0",
     "date-fns": "^4.1.0",
-    "pg-structure": "^7.15.3"
-  },
-  "peerDependencies": {
-    "@devmoods/express-extras": ">=0.46.0"
-  },
-  "devDependencies": {
-    "@bitiforms/adapter-devmoods-ui": "^0.15.0",
-    "@bitiforms/react": "^0.15.0",
-    "@devmoods/express-extras": "^0.57.3",
-    "@devmoods/fetch": "^4.1.0",
-    "@devmoods/ui": "^2.9.1",
-    "@tanstack/react-query": "^5.77.2",
-    "@types/react": "^19.1.6",
-    "@types/react-dom": "^19.1.5",
-    "@vitejs/plugin-react": "^4.5.0",
-    "@vitest/coverage-v8": "3.1.4",
-    "babel-plugin-react-compiler": "19.1.0-rc.2",
-    "dotenv": "^16.5.0",
-    "express": "^4.21.2",
-    "react": "^19.1.0",
-    "react-dom": "^19.1.0",
+    "dotenv": "^17.2.3",
+    "pg-structure": "^7.15.3",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
     "react-fast-compare": "^3.2.2",
     "react-icons": "^5.5.0",
-    "react-router": "^7.6.1",
-    "sass": "^1.89.0",
+    "react-router": "^7.9.4",
+    "sass": "^1.93.2",
     "tsup": "^8.5.0",
-    "vite": "^6.3.5",
-    "vitest": "^3.1.4",
-    "zustand": "^5.0.5"
+    "vite": "^7.1.11",
+    "zustand": "^5.0.8"
   },
-  "gitHead": "ad0fe0a15afb9540be3420360381394999f8666b"
+  "gitHead": "721a709c087904a5cc1332d28a62857a82295fea"
 }