@devmoods/postgres-admin 0.3.0 → 0.5.0

package/dist/index.d.ts

@@ -2,10 +2,14 @@ import * as express_serve_static_core from 'express-serve-static-core';
 import { createPostgres } from '@devmoods/express-extras';
 
 interface AdminRouterOptions {
-    postgres: ReturnType<typeof createPostgres>;
+    postgres?: ReturnType<typeof createPostgres>;
     basename?: string;
+    uiOptions?: AdminUIOptions;
 }
-declare function createRouter({ postgres, basename, }: AdminRouterOptions): express_serve_static_core.Router;
+interface AdminUIOptions {
+    title?: string;
+}
+declare function createRouter({ postgres: defaultPostgres, basename, uiOptions, }: AdminRouterOptions): express_serve_static_core.Router;
 
 declare const admin: typeof createRouter;
 

package/dist/index.js

@@ -3,6 +3,7 @@ import { promises as fs } from "node:fs";
 import * as path from "node:path";
 import {
   BadRequest,
+  createPostgres,
   generateCsrfToken,
   joinStatements,
   route,
@@ -15,11 +16,6 @@ import express from "express";
 import { NotFound, readEnv } from "@devmoods/express-extras";
 import "pg-structure";
 import { pgStructure } from "pg-structure/dist/main.js";
-
-// src/types.ts
-import "@bitiforms/react";
-
-// src/api/structure.ts
 var getDisplayType = (dbType) => {
   switch (dbType) {
     case "jsonb":
@@ -212,10 +208,15 @@ function queryParamToArray(queryParam) {
 
 // src/api/app.ts
 function createRouter({
-  postgres,
-  basename = "/admin"
+  postgres: defaultPostgres,
+  basename = "/admin",
+  uiOptions = {}
 }) {
+  const postgres = defaultPostgres ?? createPostgres();
   const app = express.Router();
+  if (!basename.startsWith("/")) {
+    throw new Error(`Option 'basename' must start with a slash /`);
+  }
   app.get(
     "/api/tables",
     route(async () => {
@@ -322,7 +323,7 @@ function createRouter({
         statement.append(
           joinStatements(
             definition.columnNames.map(
-              (c) => sql`${sql.identifier(c)}::text ILIKE ${`%${search}%`}`
+              (c) => sql`${sql.identifier(table)}.${sql.identifier(c)}::text ILIKE ${`%${search}%`}`
             ),
             " OR "
           )
@@ -333,14 +334,14 @@ function createRouter({
         statement.append(
           joinStatements(
             orderBy.map(
-              (o) => sql`${sql.identifier(o.column)} ${sql.raw(o.direction)}`
+              (o) => sql`${sql.identifier(table)}.${sql.identifier(o.column)} ${sql.raw(o.direction)}`
             ),
             ", "
           )
         );
       } else if (definition.primaryKey) {
         statement.append(
-          sql` ORDER BY ${sql.identifier(definition.primaryKey)}`
+          sql` ORDER BY ${sql.identifier(table)}.${sql.identifier(definition.primaryKey)}`
         );
       }
       statement.append(sql` LIMIT ${limit} OFFSET ${limit * (page - 1)}`);
@@ -436,7 +437,7 @@ function createRouter({
         "node_modules/@devmoods/postgres-admin/dist/client/_index.html",
         "utf-8"
       );
-      return content.replace("{{ csrf_token }}", generateCsrfToken(req, res)).replace(/{{ basename }}/g, basename.slice(1));
+      return content.replace(/{{ csrf_token }}/g, generateCsrfToken(req, res)).replace(/{{ basename }}/g, basename.slice(1)).replace(/{{ title }}/g, uiOptions.title ?? "Posterboi");
     })
   );
   return app;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/postgres-admin",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "type": "module",
   "files": [
     "dist"
@@ -15,33 +15,34 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@devmoods/express-extras": "^0.42.1",
+    "date-fns": "^4.1.0",
     "pg-structure": "^7.15.3"
   },
+  "peerDependencies": {
+    "@devmoods/express-extras": "^0.43.0"
+  },
   "devDependencies": {
     "@bitiforms/adapter-devmoods-ui": "^0.11.0",
     "@bitiforms/react": "^0.11.0",
     "@devmoods/fetch": "^4.0.1",
     "@devmoods/ui": "^2.3.0",
-    "@tanstack/react-query": "^5.62.2",
-    "@types/react": "^18.3.13",
-    "@types/react-dom": "^18.3.1",
+    "@tanstack/react-query": "^5.62.3",
+    "@types/react": "^19.0.1",
+    "@types/react-dom": "^19.0.1",
     "@vitejs/plugin-react": "^4.3.4",
     "@vitest/coverage-v8": "2.1.8",
-    "date-fns": "^4.1.0",
     "dotenv": "^16.4.7",
-    "express": "^4.21.1",
-    "react": "19.0.0-rc-7670501b-20241124",
-    "react-dom": "19.0.0-rc-7670501b-20241124",
+    "express": "^4.21.2",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "react-fast-compare": "^3.2.2",
-    "react-icons": "5.4.0",
+    "react-icons": "^5.4.0",
     "react-router": "^7.0.2",
     "sass": "^1.82.0",
-    "sql-formatter": "^15.4.6",
     "tsup": "^8.3.5",
     "vite": "^6.0.3",
     "vitest": "^2.1.8",
     "zustand": "^5.0.2"
   },
-  "gitHead": "dcfce4481869d3b86b21fed59c66f4e6a75c60b1"
+  "gitHead": "8e4e952ec7cc0653a5f1c638fe923dcf8ac73bed"
 }