admindb 2.2.1 → 2.3.1

package/dist/routes/databases.js

@@ -40,12 +40,11 @@ function registerDatabasesRoutes(router, ctx) {
     };
     router.get('/', async (_req, res, next) => {
         try {
-            const databases = await getDatabaseRows(manager);
             res.render('pages/databases', {
                 title: 'Databases',
-                databases,
+                databases: await getDatabaseRows(manager),
                 dbDir: manager.directory,
-                readonly: !!ctx.readonly,
+                readonly: Boolean(ctx.readonly),
                 allowBrowse,
                 browseRoot,
                 config: { basePath: ctx.basePath },
@@ -56,8 +55,7 @@ function registerDatabasesRoutes(router, ctx) {
         }
     });
     router.get('/api/databases', wrap(async (_req, res) => {
-        const data = await getDatabaseRows(manager);
-        res.json({ success: true, data });
+        res.json({ success: true, data: await getDatabaseRows(manager) });
     }));
     const BLOCKED_NAMES = new Set([
         'node_modules',
@@ -73,9 +71,7 @@ function registerDatabasesRoutes(router, ctx) {
     function listDirectory(abs) {
         const entries = [];
         for (const name of (0, node_fs_1.readdirSync)(abs)) {
-            if (name.startsWith('.'))
-                continue;
-            if (BLOCKED_NAMES.has(name) || name.toLowerCase().startsWith('.env'))
+            if (name.startsWith('.') || BLOCKED_NAMES.has(name) || name.toLowerCase().startsWith('.env'))
                 continue;
             const full = node_path_1.default.join(abs, name);
             let isDir = false;
@@ -102,9 +98,8 @@ function registerDatabasesRoutes(router, ctx) {
             return res.status(403).json({ success: false, error: 'File browsing is disabled — this server was started with specific database files.' });
         }
         const raw = String(req.query.path ?? '').trim();
-        if (raw.includes('\0')) {
+        if (raw.includes('\0'))
             return res.status(400).json({ success: false, error: 'Invalid path.' });
-        }
         const base = raw ? node_path_1.default.resolve(raw) : manager.directory;
         if (browseRoot && !(0, common_1.isPathWithinRoot)(browseRoot, base)) {
             return res.status(403).json({ success: false, error: `Path is outside the allowed folder: ${browseRoot}` });
@@ -144,13 +139,7 @@ function registerDatabasesRoutes(router, ctx) {
             return res.status(403).json({ success: false, error: `Cannot open a database outside the allowed folder: ${browseRoot}` });
         }
         const isRo = req.body?.readonly !== undefined ? Boolean(req.body.readonly) : undefined;
-        let id;
-        try {
-            id = manager.openFile(p, isRo);
-        }
-        catch (err) {
-            return res.status(400).json({ success: false, error: (0, common_1.errorMessage)(err) });
-        }
+        const id = manager.openFile(p, isRo);
         res.json({ success: true, data: { id, message: `Opened "${id}".` } });
     }));
     router.post('/api/databases/connect-postgres', wrap(async (req, res) => {
@@ -172,9 +161,8 @@ function registerDatabasesRoutes(router, ctx) {
             await db.listTables();
         }
         catch (err) {
-            if (id) {
+            if (id)
                 manager.remove(id);
-            }
             return res.status(400).json({ success: false, error: `Failed to connect to PostgreSQL: ${(0, common_1.errorMessage)(err)}` });
         }
         res.status(201).json({ success: true, data: { id, message: `Connected to PostgreSQL database "${id}".` } });
@@ -205,13 +193,7 @@ function registerDatabasesRoutes(router, ctx) {
         const name = String(req.body?.name ?? '').trim();
         if (!name)
             return res.status(400).json({ success: false, error: 'Database name is required.' });
-        let id;
-        try {
-            id = manager.create(name);
-        }
-        catch (err) {
-            return res.status(400).json({ success: false, error: (0, common_1.errorMessage)(err) });
-        }
+        const id = manager.create(name);
         res.status(201).json({ success: true, data: { id, message: `Database "${id}" created.` } });
     }));
     router.delete('/api/databases/:id', wrap(async (req, res) => {

package/dist/routes/pages.js

@@ -21,6 +21,9 @@ function buildDisplayRows(rawRows, info, table, basePath = '') {
                 let isImage = false;
                 let isUrl = false;
                 let isColor = false;
+                let isAudio = false;
+                let isVideo = false;
+                let isPdf = false;
                 let blobSize = '';
                 let blobMime = '';
                 let blobExt = '';
@@ -32,10 +35,7 @@ function buildDisplayRows(rawRows, info, table, basePath = '') {
                         if (Buffer.isBuffer(raw) || raw instanceof Uint8Array) {
                             buf = Buffer.isBuffer(raw) ? raw : Buffer.from(raw);
                         }
-                        else if (typeof v === 'string' && /^0x[0-9a-f]*$/i.test(v)) {
-                            buf = Buffer.from(v.slice(2), 'hex');
-                        }
-                        else if (typeof v === 'string' && /^\\x[0-9a-f]*$/i.test(v)) {
+                        else if (typeof v === 'string' && (/^0x[0-9a-f]*$/i.test(v) || /^\\x[0-9a-f]*$/i.test(v))) {
                             buf = Buffer.from(v.slice(2), 'hex');
                         }
                         else {
@@ -46,6 +46,9 @@ function buildDisplayRows(rawRows, info, table, basePath = '') {
                         blobMime = mimeInfo.mime;
                         blobExt = mimeInfo.ext;
                         isImage = mimeInfo.isImage;
+                        isAudio = mimeInfo.isAudio;
+                        isVideo = mimeInfo.isVideo;
+                        isPdf = mimeInfo.isPdf;
                         if (table && pkEncoded) {
                             blobUrl = `${basePath}/api/tables/${encodeURIComponent(table)}/row/${encodeURIComponent(pkEncoded)}/blob/${encodeURIComponent(c.name)}`;
                         }
@@ -54,12 +57,10 @@ function buildDisplayRows(rawRows, info, table, basePath = '') {
                         isJson = (0, datatype_1.isJsonString)(v);
                     }
                     else {
-                        if (/^https?:\/\/[^\s$.?#].[^\s]*$/i.test(str)) {
+                        if (/^https?:\/\/[^\s$.?#].[^\s]*$/i.test(str))
                             isUrl = true;
-                        }
-                        else if (/^#(?:[0-9a-fA-F]{3}){1,2}$|^rgba?\(\s*\d+\s*,\s*\d+\s*,\s*\d+/i.test(str)) {
+                        else if (/^#(?:[0-9a-fA-F]{3}){1,2}$|^rgba?\(\s*\d+\s*,\s*\d+\s*,\s*\d+/i.test(str))
                             isColor = true;
-                        }
                     }
                 }
                 return {
@@ -71,6 +72,9 @@ function buildDisplayRows(rawRows, info, table, basePath = '') {
                     isBlob,
                     isJson,
                     isImage,
+                    isAudio,
+                    isVideo,
+                    isPdf,
                     isUrl,
                     isColor,
                     blobSize,
@@ -92,7 +96,7 @@ function registerPages(router, ctx) {
         try {
             const names = res.locals.tables ?? [];
             const internalNames = res.locals.internalTables ?? [];
-            let colCountsMap = {};
+            const colCountsMap = {};
             if (db.dialect === 'postgres') {
                 const colRes = await db.all(`SELECT table_name, count(*)::int AS cols FROM information_schema.columns WHERE table_schema = 'public' GROUP BY table_name;`);
                 if (colRes.success && colRes.data) {
@@ -173,15 +177,12 @@ function registerPages(router, ctx) {
                     type: c.type,
                     active,
                     dir: active ? orderDir : null,
-                    href: `${basePath}/tables/${encodeURIComponent(table)}?${qs}${filterQS ? '&' + filterQS : ''}`,
+                    href: `${basePath}/tables/${encodeURIComponent(table)}?${qs}${filterQS ? `&${filterQS}` : ''}`,
                 };
             });
             const refColumns = (refsR.data ?? [])
                 .filter((r) => !r.table.startsWith('_'))
-                .map((rt) => {
-                const ref = rt.refs[0];
-                return { table: rt.table, from: ref?.from ?? '', to: ref?.to ?? '' };
-            });
+                .map((rt) => ({ table: rt.table, from: rt.refs[0]?.from ?? '', to: rt.refs[0]?.to ?? '' }));
             const countEntries = await Promise.all(refColumns.map(async (col) => {
                 const values = rawRows
                     .map((r) => r[col.to])
@@ -271,9 +272,55 @@ function registerPages(router, ctx) {
             next(err);
         }
     });
-    router.get('/tables/:table/seed', async (req, res, next) => {
+    router.get('/seed', async (req, res, next) => {
+        try {
+            const tableNames = res.locals.tables ?? [];
+            if (tableNames.length === 0) {
+                return res.render('pages/seed-select', {
+                    title: 'Seed Data Generator',
+                    tables: [],
+                    hasTables: false,
+                    dialect: db.dialect,
+                });
+            }
+            const tableStats = await Promise.all(tableNames.map(async (name) => {
+                const [info, countRes] = await Promise.all([db.getTableInfo(name), db.getRowCount(name)]);
+                const cols = info.success && info.data ? info.data.columns.length : 0;
+                const fks = info.success && info.data ? info.data.foreignKeys.length : 0;
+                const rowCount = countRes.success ? countRes.data : 0;
+                return {
+                    name,
+                    cols,
+                    fks,
+                    rowCount,
+                };
+            }));
+            const defaultTable = req.query.table ? String(req.query.table) : tableStats[0]?.name;
+            const defaultMode = req.query.mode === 'chain' ? 'chain' : 'single';
+            res.render('pages/seed-select', {
+                title: 'Seed Data Generator · Choose Table & Mode',
+                tables: tableStats,
+                hasTables: true,
+                defaultTable,
+                defaultMode,
+                dialect: db.dialect,
+            });
+        }
+        catch (err) {
+            next(err);
+        }
+    });
+    router.get('/tables/:table/seed', (req, res) => {
+        const table = req.params.table;
+        const qs = req.url.includes('?') ? req.url.slice(req.url.indexOf('?')) : '';
+        const bp = res.locals.basePath || '';
+        return res.redirect(301, `${bp}/seed/${encodeURIComponent(table)}${qs}`);
+    });
+    router.get('/seed/:table', async (req, res, next) => {
         try {
             const table = req.params.table;
+            const allTables = res.locals.tables ?? [];
+            const initialMode = req.query.mode === 'chain' ? 'chain' : 'single';
             const [info, countRes] = await Promise.all([db.getTableInfo(table), db.getRowCount(table)]);
             if (!info.success || !info.data || info.data.columns.length === 0) {
                 return notFound(res, `Table "${table}" does not exist.`);
@@ -284,11 +331,14 @@ function registerPages(router, ctx) {
             res.render('pages/seed', {
                 title: `Seed data · ${table}`,
                 table,
+                allTables,
+                mode: initialMode,
+                isChainMode: initialMode === 'chain',
                 rowCount,
                 colCount: info.data.columns.length,
                 maxRows: index_1.MAX_SEED_ROWS,
                 quickCounts: [10, 50, 100, 500, 1000, index_1.MAX_SEED_ROWS],
-                seedConfig: { table, columns, rowCount, maxRows: index_1.MAX_SEED_ROWS },
+                seedConfig: { table, columns, rowCount, maxRows: index_1.MAX_SEED_ROWS, mode: initialMode },
             });
         }
         catch (err) {
@@ -382,10 +432,9 @@ function registerPages(router, ctx) {
     router.get('/info', async (_req, res, next) => {
         try {
             const settingsRes = await db.getSettings();
-            const settings = settingsRes.success ? settingsRes.data : {};
             res.render('pages/info', {
                 title: 'Database Info',
-                settings,
+                settings: settingsRes.success ? settingsRes.data : {},
                 dialect: db.dialect,
                 dbPath: db.path,
             });

package/dist/serverless.js

@@ -11,59 +11,56 @@ function isServerlessEnvironment(env = process.env) {
     if (['1', 'true', 'yes', 'on'].includes(String(env.ADMINDB_SERVERLESS ?? env.SERVERLESS ?? env.IS_SERVERLESS ?? '').trim().toLowerCase())) {
         return true;
     }
-    if (Boolean(env.VERCEL || env.VERCEL_ENV || env.NOW_REGION)) {
-        return true;
-    }
-    if (Boolean(env.AWS_LAMBDA_FUNCTION_NAME || env.LAMBDA_TASK_ROOT || env.AWS_EXECUTION_ENV)) {
-        return true;
-    }
-    if (Boolean(env.NETLIFY || env.NETLIFY_LOCAL)) {
-        return true;
-    }
-    if (Boolean(env.FUNCTION_TARGET || env.FUNCTION_NAME || env.K_SERVICE)) {
-        return true;
-    }
-    if (Boolean(env.FUNCTIONS_WORKER_RUNTIME || env.WEBSITE_INSTANCE_ID)) {
-        return true;
-    }
-    if (Boolean(env.CF_PAGES)) {
-        return true;
-    }
-    return false;
+    return Boolean(env.VERCEL || env.VERCEL_ENV || env.NOW_REGION ||
+        env.AWS_LAMBDA_FUNCTION_NAME || env.LAMBDA_TASK_ROOT || env.AWS_EXECUTION_ENV ||
+        env.NETLIFY || env.NETLIFY_LOCAL ||
+        env.FUNCTION_TARGET || env.FUNCTION_NAME || env.K_SERVICE ||
+        env.FUNCTIONS_WORKER_RUNTIME || env.WEBSITE_INSTANCE_ID ||
+        env.CF_PAGES);
 }
 function createServerlessHandler(options = {}) {
-    const rawTarget = options.connection || options.dbPath || '';
+    const envTarget = process.env.ADMINDB_CONNECTION ||
+        process.env.DATABASE_URL ||
+        process.env.POSTGRES_URL ||
+        process.env.PG_CONNECTION ||
+        '';
+    const rawTarget = options.connection || options.dbPath || ((0, common_1.isPostgresConnectionString)(envTarget) ? envTarget : '');
     const isPg = Boolean(options.pgOptions) ||
         (0, common_1.isPostgresConnectionString)(rawTarget) ||
         options.db?.dialect === 'postgres';
-    const defaultReadonly = isPg ? false : true;
+    const defaultReadonly = !isPg;
     const app = (0, app_1.createRouter)({
         ...options,
+        connection: options.connection || ((0, common_1.isPostgresConnectionString)(rawTarget) ? rawTarget : undefined),
         serverless: options.serverless ?? true,
-        readonly: options.readonly ?? defaultReadonly,
+        readonly: options.readonly !== undefined ? Boolean(options.readonly) : defaultReadonly,
     });
     return (req, res) => {
         app(req, res);
     };
 }
 function createLambdaHandler(options = {}) {
-    const rawTarget = options.connection || options.dbPath || '';
+    const envTarget = process.env.ADMINDB_CONNECTION ||
+        process.env.DATABASE_URL ||
+        process.env.POSTGRES_URL ||
+        process.env.PG_CONNECTION ||
+        '';
+    const rawTarget = options.connection || options.dbPath || ((0, common_1.isPostgresConnectionString)(envTarget) ? envTarget : '');
     const isPg = Boolean(options.pgOptions) ||
         (0, common_1.isPostgresConnectionString)(rawTarget) ||
         options.db?.dialect === 'postgres';
-    const defaultReadonly = isPg ? false : true;
+    const defaultReadonly = !isPg;
     const app = (0, app_1.createRouter)({
         ...options,
+        connection: options.connection || ((0, common_1.isPostgresConnectionString)(rawTarget) ? rawTarget : undefined),
         serverless: options.serverless ?? true,
-        readonly: options.readonly ?? defaultReadonly,
+        readonly: options.readonly !== undefined ? Boolean(options.readonly) : defaultReadonly,
     });
     return async (event, _context) => {
         return new Promise((resolve) => {
             try {
                 const isV2 = Boolean(event.version === '2.0' || event.rawPath);
-                const method = (isV2
-                    ? event.requestContext?.http?.method
-                    : event.httpMethod) || 'GET';
+                const method = (isV2 ? event.requestContext?.http?.method : event.httpMethod) || 'GET';
                 const rawPath = isV2 ? (event.rawPath || '/') : (event.path || '/');
                 const qs = isV2
                     ? (event.rawQueryString || '')
@@ -76,24 +73,17 @@ function createLambdaHandler(options = {}) {
                 const rawHeaders = event.headers || {};
                 const headers = {};
                 for (const [k, v] of Object.entries(rawHeaders)) {
-                    if (v !== undefined && v !== null) {
+                    if (v !== undefined && v !== null)
                         headers[k.toLowerCase()] = String(v);
-                    }
                 }
                 if (event.cookies && Array.isArray(event.cookies) && !headers['cookie']) {
                     headers['cookie'] = event.cookies.join('; ');
                 }
                 let bodyBuffer = null;
                 if (event.body) {
-                    if (event.isBase64Encoded) {
-                        bodyBuffer = Buffer.from(event.body, 'base64');
-                    }
-                    else {
-                        bodyBuffer = Buffer.from(event.body, 'utf8');
-                    }
-                    if (!headers['content-length']) {
+                    bodyBuffer = event.isBase64Encoded ? Buffer.from(event.body, 'base64') : Buffer.from(event.body, 'utf8');
+                    if (!headers['content-length'])
                         headers['content-length'] = String(bodyBuffer.length);
-                    }
                 }
                 const socket = new node_net_1.Socket();
                 const req = new node_http_1.IncomingMessage(socket);
@@ -103,16 +93,14 @@ function createLambdaHandler(options = {}) {
                 req.httpVersion = '1.1';
                 req.httpVersionMajor = 1;
                 req.httpVersionMinor = 1;
-                if (bodyBuffer) {
+                if (bodyBuffer)
                     req.push(bodyBuffer);
-                }
                 req.push(null);
                 const res = new node_http_1.ServerResponse(req);
                 const chunks = [];
                 res.write = function (chunk, ...args) {
-                    if (chunk) {
+                    if (chunk)
                         chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-                    }
                     const cb = typeof args[0] === 'function' ? args[0] : typeof args[1] === 'function' ? args[1] : undefined;
                     if (cb)
                         cb();
@@ -133,8 +121,7 @@ function createLambdaHandler(options = {}) {
                         cb();
                     const responseHeaders = {};
                     const multiValueHeaders = {};
-                    const resHeaders = res.getHeaders();
-                    for (const [k, v] of Object.entries(resHeaders)) {
+                    for (const [k, v] of Object.entries(res.getHeaders())) {
                         if (Array.isArray(v)) {
                             multiValueHeaders[k] = v.map(String);
                             responseHeaders[k] = v.map(String).join(', ');

package/dist/sql/generator.d.ts

@@ -1 +1 @@
-export declare const SQLITE_DESIGNER_TYPES:readonly ["TEXT","INTEGER","REAL","BLOB","BOOLEAN","DATE","DATETIME","NUMERIC","VARCHAR(255)","JSON"];export declare const POSTGRES_DESIGNER_TYPES:readonly ["TEXT","VARCHAR(255)","INTEGER","BIGINT","SMALLINT","SERIAL","BIGSERIAL","REAL","DECIMAL(10,2)","NUMERIC","BOOLEAN","DATE","DATETIME","TIMESTAMP","TIMESTAMPTZ","TIME","INTERVAL","JSON","JSONB","UUID","BYTEA","INET"];export declare const DESIGNER_TYPES:readonly ["TEXT","VARCHAR(255)","INTEGER","BIGINT","SMALLINT","SERIAL","BIGSERIAL","REAL","DECIMAL(10,2)","NUMERIC","BOOLEAN","DATE","DATETIME","TIMESTAMP","TIMESTAMPTZ","TIME","INTERVAL","JSON","JSONB","UUID","BYTEA","BLOB","INET"];export declare function getDesignerTypes(dialect?:'sqlite'|'postgres'):readonly string[];export type DesignerColumnType=( typeof DESIGNER_TYPES)[number];export interface ColumnDef{name:string;type:string;primaryKey?:boolean;notNull?:boolean;unique?:boolean;defaultValue?:string|null;foreignKey?:{table:string;column:string;}|null;}export interface FieldValue{column:string;value:unknown;}export declare function quoteIdentifier(identifier:string):string;export declare function escapeString(value:string):string;export declare function sqlValue(value:unknown):string;export interface MappedType{sqlType:string;defaultAuto?:string;}export declare function mapColumnType(type:string):MappedType;export interface RenderOptions{forAddColumn?:boolean;}export declare function formatSqlDefault(raw:string,colType?:string):string;export declare function renderColumnDef(col:ColumnDef,opts?:RenderOptions):string;export declare function generateCreateTable(tableName:string,columns:ColumnDef[]):string;export declare function generateAddColumn(tableName:string,col:ColumnDef):string;export declare function generateRenameTable(tableName:string,newName:string):string;export declare function generateRenameColumn(tableName:string,oldName:string,newName:string):string;export declare function generateDropColumn(tableName:string,column:string):string;export declare function generateDropTable(tableName:string):string;export interface IndexDef{name?:string;columns:string[];unique?:boolean;}export declare function generateCreateIndex(tableName:string,index:IndexDef):string;export declare function generateDropIndex(indexName:string):string;export declare function generateInsert(table:string,fields:FieldValue[]):string;export declare function generateUpdate(table:string,fields:FieldValue[],where:FieldValue[]):string;
+export declare const SQLITE_DESIGNER_TYPES:readonly ["TEXT","INTEGER","REAL","BLOB","BOOLEAN","DATE","DATETIME","NUMERIC","VARCHAR(255)","JSON"];export declare const POSTGRES_DESIGNER_TYPES:readonly ["TEXT","VARCHAR(255)","INTEGER","BIGINT","SMALLINT","SERIAL","BIGSERIAL","REAL","DECIMAL(10,2)","NUMERIC","BOOLEAN","DATE","DATETIME","TIMESTAMP","TIMESTAMPTZ","TIME","INTERVAL","JSON","JSONB","UUID","BYTEA","INET"];export declare const DESIGNER_TYPES:readonly ["TEXT","VARCHAR(255)","INTEGER","BIGINT","SMALLINT","SERIAL","BIGSERIAL","REAL","DECIMAL(10,2)","NUMERIC","BOOLEAN","DATE","DATETIME","TIMESTAMP","TIMESTAMPTZ","TIME","INTERVAL","JSON","JSONB","UUID","BYTEA","BLOB","INET"];export declare const getDesignerTypes:(dialect?:"sqlite"|"postgres")=>readonly string[];export type DesignerColumnType=( typeof DESIGNER_TYPES)[number];export interface ColumnDef{name:string;type:string;primaryKey?:boolean;notNull?:boolean;unique?:boolean;defaultValue?:string|null;foreignKey?:{table:string;column:string;}|null;}export interface FieldValue{column:string;value:unknown;}export declare const quoteIdentifier:(identifier:string)=>string;export declare const escapeString:(value:string)=>string;export declare function sqlValue(value:unknown):string;export interface MappedType{sqlType:string;defaultAuto?:string;}export declare function mapColumnType(type:string):MappedType;export interface RenderOptions{forAddColumn?:boolean;}export declare function formatSqlDefault(raw:string,colType?:string):string;export declare function renderColumnDef(col:ColumnDef,opts?:RenderOptions):string;export declare function generateCreateTable(tableName:string,columns:ColumnDef[]):string;export declare function generateAddColumn(tableName:string,col:ColumnDef):string;export declare function generateRenameTable(tableName:string,newName:string):string;export declare function generateRenameColumn(tableName:string,oldName:string,newName:string):string;export declare function generateDropColumn(tableName:string,column:string):string;export declare function generateDropTable(tableName:string):string;export interface IndexDef{name?:string;columns:string[];unique?:boolean;}export declare function generateCreateIndex(tableName:string,index:IndexDef):string;export declare function generateDropIndex(indexName:string):string;export declare function generateInsert(table:string,fields:FieldValue[]):string;export declare function generateUpdate(table:string,fields:FieldValue[],where:FieldValue[]):string;