admindb 2.2.1 → 2.3.1

package/dist/utils/datatype.js

@@ -6,60 +6,66 @@ exports.analyzeBlob = analyzeBlob;
 exports.isJsonString = isJsonString;
 exports.formatJsonSafely = formatJsonSafely;
 const common_js_1 = require("./common.js");
+const mimeResult = (mime, ext, flags = {}) => ({
+    mime,
+    ext,
+    isImage: false,
+    isText: false,
+    isPdf: false,
+    isAudio: false,
+    isVideo: false,
+    ...flags,
+});
 function sniffMimeType(buf) {
     const len = buf.length;
-    if (len === 0) {
-        return { mime: 'application/octet-stream', ext: 'bin', isImage: false, isText: false, isPdf: false, isAudio: false, isVideo: false };
-    }
+    if (len === 0)
+        return mimeResult('application/octet-stream', 'bin');
     if (len >= 8 && buf[0] === 0x89 && buf[1] === 0x50 && buf[2] === 0x4e && buf[3] === 0x47 && buf[4] === 0x0d && buf[5] === 0x0a && buf[6] === 0x1a && buf[7] === 0x0a) {
-        return { mime: 'image/png', ext: 'png', isImage: true, isText: false, isPdf: false, isAudio: false, isVideo: false };
+        return mimeResult('image/png', 'png', { isImage: true });
     }
     if (len >= 3 && buf[0] === 0xff && buf[1] === 0xd8 && buf[2] === 0xff) {
-        return { mime: 'image/jpeg', ext: 'jpg', isImage: true, isText: false, isPdf: false, isAudio: false, isVideo: false };
+        return mimeResult('image/jpeg', 'jpg', { isImage: true });
     }
     if (len >= 6 && buf[0] === 0x47 && buf[1] === 0x49 && buf[2] === 0x46 && buf[3] === 0x38 && (buf[4] === 0x37 || buf[4] === 0x39) && buf[5] === 0x61) {
-        return { mime: 'image/gif', ext: 'gif', isImage: true, isText: false, isPdf: false, isAudio: false, isVideo: false };
+        return mimeResult('image/gif', 'gif', { isImage: true });
     }
     if (len >= 12 && buf[0] === 0x52 && buf[1] === 0x49 && buf[2] === 0x46 && buf[3] === 0x46 && buf[8] === 0x57 && buf[9] === 0x45 && buf[10] === 0x42 && buf[11] === 0x50) {
-        return { mime: 'image/webp', ext: 'webp', isImage: true, isText: false, isPdf: false, isAudio: false, isVideo: false };
+        return mimeResult('image/webp', 'webp', { isImage: true });
     }
     if (len >= 2 && buf[0] === 0x42 && buf[1] === 0x4d) {
-        return { mime: 'image/bmp', ext: 'bmp', isImage: true, isText: false, isPdf: false, isAudio: false, isVideo: false };
+        return mimeResult('image/bmp', 'bmp', { isImage: true });
     }
     if (len >= 4 && buf[0] === 0x00 && buf[1] === 0x00 && buf[2] === 0x01 && buf[3] === 0x00) {
-        return { mime: 'image/x-icon', ext: 'ico', isImage: true, isText: false, isPdf: false, isAudio: false, isVideo: false };
+        return mimeResult('image/x-icon', 'ico', { isImage: true });
     }
     if (len >= 4 && buf[0] === 0x25 && buf[1] === 0x50 && buf[2] === 0x44 && buf[3] === 0x46) {
-        return { mime: 'application/pdf', ext: 'pdf', isImage: false, isText: false, isPdf: true, isAudio: false, isVideo: false };
-    }
-    if (len >= 3 && buf[0] === 0x49 && buf[1] === 0x44 && buf[2] === 0x33) {
-        return { mime: 'audio/mpeg', ext: 'mp3', isImage: false, isText: false, isPdf: false, isAudio: true, isVideo: false };
+        return mimeResult('application/pdf', 'pdf', { isPdf: true });
     }
-    if (len >= 2 && buf[0] === 0xff && (buf[1] & 0xe0) === 0xe0) {
-        return { mime: 'audio/mpeg', ext: 'mp3', isImage: false, isText: false, isPdf: false, isAudio: true, isVideo: false };
+    if ((len >= 3 && buf[0] === 0x49 && buf[1] === 0x44 && buf[2] === 0x33) || (len >= 2 && buf[0] === 0xff && (buf[1] & 0xe0) === 0xe0)) {
+        return mimeResult('audio/mpeg', 'mp3', { isAudio: true });
     }
     if (len >= 12 && buf[0] === 0x52 && buf[1] === 0x49 && buf[2] === 0x46 && buf[3] === 0x46 && buf[8] === 0x57 && buf[9] === 0x41 && buf[10] === 0x56 && buf[11] === 0x45) {
-        return { mime: 'audio/wav', ext: 'wav', isImage: false, isText: false, isPdf: false, isAudio: true, isVideo: false };
+        return mimeResult('audio/wav', 'wav', { isAudio: true });
     }
     if (len >= 4 && buf[0] === 0x4f && buf[1] === 0x67 && buf[2] === 0x67 && buf[3] === 0x53) {
-        return { mime: 'audio/ogg', ext: 'ogg', isImage: false, isText: false, isPdf: false, isAudio: true, isVideo: false };
+        return mimeResult('audio/ogg', 'ogg', { isAudio: true });
     }
     if (len >= 8 && buf[4] === 0x66 && buf[5] === 0x74 && buf[6] === 0x79 && buf[7] === 0x70) {
-        return { mime: 'video/mp4', ext: 'mp4', isImage: false, isText: false, isPdf: false, isAudio: false, isVideo: true };
+        return mimeResult('video/mp4', 'mp4', { isVideo: true });
     }
     if (len >= 4 && buf[0] === 0x1a && buf[1] === 0x45 && buf[2] === 0xdf && buf[3] === 0xa3) {
-        return { mime: 'video/webm', ext: 'webm', isImage: false, isText: false, isPdf: false, isAudio: false, isVideo: true };
+        return mimeResult('video/webm', 'webm', { isVideo: true });
     }
     const sampleLen = Math.min(len, 1024);
     const sample = Buffer.from(buf.subarray(0, sampleLen)).toString('utf8');
     const trimmed = sample.trim();
     if (trimmed.startsWith('<svg') || (trimmed.startsWith('<?xml') && trimmed.includes('<svg'))) {
-        return { mime: 'image/svg+xml', ext: 'svg', isImage: true, isText: true, isPdf: false, isAudio: false, isVideo: false };
+        return mimeResult('image/svg+xml', 'svg', { isImage: true, isText: true });
     }
     if ((trimmed.startsWith('{') && trimmed.endsWith('}')) || (trimmed.startsWith('[') && trimmed.endsWith(']'))) {
         try {
             JSON.parse(sample);
-            return { mime: 'application/json', ext: 'json', isImage: false, isText: true, isPdf: false, isAudio: false, isVideo: false };
+            return mimeResult('application/json', 'json', { isText: true });
         }
         catch {
         }
@@ -72,15 +78,16 @@ function sniffMimeType(buf) {
         }
     }
     if (nonPrintable === 0) {
-        return { mime: 'text/plain; charset=utf-8', ext: 'txt', isImage: false, isText: true, isPdf: false, isAudio: false, isVideo: false };
+        return mimeResult('text/plain; charset=utf-8', 'txt', { isText: true });
     }
-    return { mime: 'application/octet-stream', ext: 'bin', isImage: false, isText: false, isPdf: false, isAudio: false, isVideo: false };
+    return mimeResult('application/octet-stream', 'bin');
 }
 function generateHexDump(buf, maxBytes = 4096, bytesPerLine = 16) {
     const totalBytes = buf.length;
     const limit = Math.min(totalBytes, maxBytes);
     const truncated = totalBytes > maxBytes;
     const lines = [];
+    const mid = Math.floor(bytesPerLine / 2);
     for (let i = 0; i < limit; i += bytesPerLine) {
         const offset = i.toString(16).padStart(8, '0');
         const chunk = buf.subarray(i, Math.min(i + bytesPerLine, limit));
@@ -90,18 +97,16 @@ function generateHexDump(buf, maxBytes = 4096, bytesPerLine = 16) {
             if (j < chunk.length) {
                 const byte = chunk[j];
                 hexParts.push(byte.toString(16).padStart(2, '0'));
-                asciiPart += (byte >= 32 && byte <= 126) ? String.fromCharCode(byte) : '.';
+                asciiPart += byte >= 32 && byte <= 126 ? String.fromCharCode(byte) : '.';
             }
             else {
                 hexParts.push('  ');
                 asciiPart += ' ';
             }
         }
-        const mid = Math.floor(bytesPerLine / 2);
-        const hexFormatted = hexParts.slice(0, mid).join(' ') + '  ' + hexParts.slice(mid).join(' ');
         lines.push({
             offset,
-            hex: hexFormatted,
+            hex: `${hexParts.slice(0, mid).join(' ')}  ${hexParts.slice(mid).join(' ')}`,
             ascii: asciiPart,
         });
     }
@@ -110,12 +115,7 @@ function generateHexDump(buf, maxBytes = 4096, bytesPerLine = 16) {
 function analyzeBlob(data) {
     let buf;
     if (typeof data === 'string') {
-        if (data.startsWith('0x') || data.startsWith('0X')) {
-            buf = Buffer.from(data.slice(2), 'hex');
-        }
-        else {
-            buf = Buffer.from(data, 'utf8');
-        }
+        buf = /^0x/i.test(data) ? Buffer.from(data.slice(2), 'hex') : Buffer.from(data, 'utf8');
     }
     else {
         buf = Buffer.isBuffer(data) ? data : Buffer.from(data);
@@ -144,38 +144,24 @@ function isJsonString(value) {
     if (typeof value !== 'string')
         return false;
     const trimmed = value.trim();
-    if (!trimmed)
+    if (!trimmed || (!trimmed.startsWith('{') && !trimmed.startsWith('[')))
+        return false;
+    try {
+        JSON.parse(trimmed);
+        return true;
+    }
+    catch {
         return false;
-    if ((trimmed.startsWith('{') && trimmed.endsWith('}')) || (trimmed.startsWith('[') && trimmed.endsWith(']'))) {
-        try {
-            JSON.parse(trimmed);
-            return true;
-        }
-        catch {
-            return false;
-        }
     }
-    return false;
 }
 function formatJsonSafely(value, indent = 2) {
-    if (value === null || value === undefined)
+    if (value == null)
         return null;
-    if (typeof value === 'object') {
-        try {
-            return JSON.stringify(value, null, indent);
-        }
-        catch {
-            return null;
-        }
+    try {
+        const obj = typeof value === 'string' ? JSON.parse(value) : value;
+        return typeof obj === 'object' && obj !== null ? JSON.stringify(obj, null, indent) : null;
     }
-    if (typeof value === 'string') {
-        try {
-            const parsed = JSON.parse(value);
-            return JSON.stringify(parsed, null, indent);
-        }
-        catch {
-            return null;
-        }
+    catch {
+        return null;
     }
-    return null;
 }

package/dist/utils/icons.js

@@ -45,6 +45,9 @@ exports.ICONS = {
     spinner: '<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24"><circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle><path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>',
     terminal: '<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"/></svg>',
     format: '<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M4 6h16M4 12h10M4 18h14"/></svg>',
+    columns: '<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 4.5v15m6-15v15m-10.875 0h15.75c.621 0 1.125-.504 1.125-1.125V5.625c0-.621-.504-1.125-1.125-1.125H4.125C3.504 4.5 3 5.004 3 5.625v12.75c0 .621.504 1.125 1.125 1.125z" /></svg>',
+    pin: '<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M19 13.5l-5-5m3-3.5a2.121 2.121 0 00-3 0L9.5 9.5 5 10l5 5 .5 4.5 4.5-4.5a2.121 2.121 0 000-3zM4 20l5-5" /></svg>',
+    grip: '<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><circle cx="9" cy="7" r="1.2" fill="currentColor"/><circle cx="15" cy="7" r="1.2" fill="currentColor"/><circle cx="9" cy="12" r="1.2" fill="currentColor"/><circle cx="15" cy="12" r="1.2" fill="currentColor"/><circle cx="9" cy="17" r="1.2" fill="currentColor"/><circle cx="15" cy="17" r="1.2" fill="currentColor"/></svg>',
     check: '<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M5 13l4 4L19 7" /></svg>',
     x: '<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" /></svg>',
     warning: '<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" /></svg>',
@@ -70,12 +73,9 @@ exports.ICONS = {
 };
 function renderIcon(name, customClass) {
     const svg = exports.ICONS[name];
-    if (!svg)
-        return '';
-    if (!customClass)
-        return svg;
-    if (svg.includes('class="')) {
-        return svg.replace(/class="[^"]*"/, `class="${customClass}"`);
-    }
-    return svg.replace('<svg', `<svg class="${customClass}"`);
+    if (!svg || !customClass)
+        return svg || '';
+    return svg.includes('class="')
+        ? svg.replace(/class="[^"]*"/, `class="${customClass}"`)
+        : svg.replace('<svg', `<svg class="${customClass}"`);
 }

package/dist/views/layouts/main.hbs

@@ -1,87 +1 @@
-<!DOCTYPE html>
-<html lang="en" data-theme="admindb">
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>{{title}} · AdminDB</title>
-  <link rel="preconnect" href="https://fonts.googleapis.com" />
-  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800&family=JetBrains+Mono:wght@400;500;600&display=swap" rel="stylesheet" />
-  <link rel="stylesheet" href="{{basePath}}/css/app.css" />
-  <script>
-    window.APP = {
-      basePath: {{{json basePath}}},
-      readonly: {{{json readonly}}},
-      serverless: {{{json serverless}}},
-      dialect: {{{json dialect}}},
-      isSqlite: {{{json isSqlite}}},
-      isPostgres: {{{json isPostgres}}}
-    };
-    // Apply the saved theme before first paint to avoid a flash.
-    (function () {
-      try {
-        var t = localStorage.getItem('admindb-theme');
-        if (t === 'dark') document.documentElement.setAttribute('data-theme', 'admindbDark');
-      } catch (e) {}
-    })();
-  </script>
-  <script>
-    window.AdminIcons = {
-      map: {{{json icons}}},
-      get: function(name, customClass) {
-        var svg = this.map[name] || '';
-        if (!svg || !customClass) return svg;
-        if (svg.indexOf('class="') !== -1) {
-          return svg.replace(/class="[^"]*"/, 'class="' + customClass + '"');
-        }
-        return svg.replace('<svg', '<svg class="' + customClass + '"');
-      }
-    };
-  </script>
-  <script src="{{basePath}}/js/common.js" defer></script>
-  <script src="{{basePath}}/js/api.js" defer></script>
-  <script src="{{basePath}}/js/app.js" defer></script>
-  <script src="{{basePath}}/js/inspector.js" defer></script>
-</head>
-<body class="min-h-screen bg-base-200 text-base-content">
-  {{#if readonly}}
-    <div class="flex items-center justify-center gap-2 bg-warning/15 px-4 py-2 text-center text-sm font-semibold text-warning">
-      <span class="shrink-0">{{{icon "warning" class="h-4 w-4"}}}</span>
-      {{#if serverless}}
-        Serverless mode active — database is open in read-only mode. Writes and schema modifications are disabled.
-      {{else}}
-        Read-only mode — this database is open without write access. All writes are disabled.
-      {{/if}}
-    </div>
-  {{/if}}
-  {{#if noSidebar}}
-    <div class="flex min-h-screen flex-col">
-      {{> navbar}}
-      <main class="mx-auto w-full max-w-[1500px] flex-1 px-4 py-6 sm:px-6 lg:px-8 lg:py-8">
-        {{{body}}}
-      </main>
-      <footer class="border-t border-base-300 px-6 py-4 text-center text-xs text-base-content/40">
-        AdminDB{{#if version}} v{{version}}{{/if}} · SQLite & PostgreSQL database administration
-      </footer>
-    </div>
-  {{else}}
-    <div class="drawer lg:drawer-open">
-      <input id="sidebar-toggle" type="checkbox" class="drawer-toggle" />
-      <div class="drawer-content flex min-h-screen flex-col">
-        {{> navbar}}
-        <main class="mx-auto w-full max-w-[1500px] flex-1 px-4 py-6 sm:px-6 lg:px-8 lg:py-8">
-          {{{body}}}
-        </main>
-        <footer class="border-t border-base-300 px-6 py-4 text-center text-xs text-base-content/40">
-          AdminDB{{#if version}} v{{version}}{{/if}} · SQLite & PostgreSQL database administration
-        </footer>
-      </div>
-      <div class="drawer-side z-40">
-        <label for="sidebar-toggle" aria-label="close sidebar" class="drawer-overlay"></label>
-        {{> sidebar}}
-      </div>
-    </div>
-  {{/if}}
-  <div id="toast-container" class="pointer-events-none fixed inset-x-0 top-4 z-50 flex flex-col items-center gap-2 px-4"></div>
-</body>
-</html>
+<!DOCTYPE html>
  <meta charset="utf-8" />
  <meta name="viewport" content="width=device-width, initial-scale=1" />
  <title>{{title}} · AdminDB</title>
  <link rel="preconnect" href="https://fonts.googleapis.com" />
  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
  <link href="https://fonts.googleapis.com/css2?family=Sora:wght@400;500;600;700;800&family=IBM+Plex+Sans:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500;600&display=swap" rel="stylesheet" />
  <link rel="stylesheet" href="{{basePath}}/css/app.css" />
  <script>
    window.APP = {
      basePath: {{{json basePath}}},
      readonly: {{{json readonly}}},
      serverless: {{{json serverless}}},
      dialect: {{{json dialect}}},
      isSqlite: {{{json isSqlite}}},
      isPostgres: {{{json isPostgres}}}
    };
    // Apply the saved theme before first paint to avoid a flash.
    (function () {
      try {
        var t = localStorage.getItem('admindb-theme');
        if (t === 'dark') document.documentElement.setAttribute('data-theme', 'admindbDark');
      } catch (e) {}
    })();
  </script>
  <script>
    window.AdminIcons = {
      map: {{{json icons}}},
      get: function(name, customClass) {
        var svg = this.map[name] || '';
        if (!svg || !customClass) return svg;
        if (svg.indexOf('class="') !== -1) {
          return svg.replace(/class="[^"]*"/, 'class="' + customClass + '"');
        }
        return svg.replace('<svg', '<svg class="' + customClass + '"');
      }
    };
  </script>
  <script src="{{basePath}}/js/common.js" defer></script>
  <script src="{{basePath}}/js/api.js" defer></script>
  <script src="{{basePath}}/js/app.js" defer></script>
  <script src="{{basePath}}/js/inspector.js" defer></script>
  <div class="pointer-events-none fixed -left-24 top-32 -z-10 h-72 w-72 rounded-full bg-primary/15 blur-3xl"></div>
  <div class="pointer-events-none fixed -right-24 bottom-20 -z-10 h-80 w-80 rounded-full bg-orange-500/10 blur-3xl"></div>
  {{#if readonly}}
    <div class="flex items-center justify-center gap-2 bg-warning/15 px-4 py-2 text-center text-sm font-semibold text-warning">
      <span class="shrink-0">{{{icon "warning" class="h-4 w-4"}}}</span>
      {{#if serverless}}
        Serverless mode active — database is open in read-only mode. Writes and schema modifications are disabled.
      {{else}}
        Read-only mode — this database is open without write access. All writes are disabled.
      {{/if}}
    </div>
  {{/if}}
  {{#if noSidebar}}
    <div class="flex min-h-screen flex-col">
      {{> navbar}}
      <main class="mx-auto w-full max-w-[1500px] flex-1 px-4 py-6 sm:px-6 lg:px-8 lg:py-8">
        {{{body}}}
      </main>
      <footer class="border-t border-base-300 px-6 py-4 text-center text-xs text-base-content/40">
        AdminDB{{#if version}} v{{version}}{{/if}} · SQLite & PostgreSQL database administration
      </footer>
    </div>
  {{else}}
    <div class="drawer lg:drawer-open">
      <input id="sidebar-toggle" type="checkbox" class="drawer-toggle" />
      <div class="drawer-content flex min-h-screen flex-col">
        {{> navbar}}
        <main class="mx-auto w-full max-w-[1500px] flex-1 px-4 py-6 sm:px-6 lg:px-8 lg:py-8">
          {{{body}}}
        </main>
        <footer class="border-t border-base-300 px-6 py-4 text-center text-xs text-base-content/40">
          AdminDB{{#if version}} v{{version}}{{/if}} · SQLite & PostgreSQL database administration
        </footer>
      </div>
      <div class="drawer-side z-40">
        <label for="sidebar-toggle" aria-label="close sidebar" class="drawer-overlay"></label>
        {{> sidebar}}
      </div>
    </div>
  {{/if}}
  <div id="toast-container" class="pointer-events-none fixed inset-x-0 top-4 z-50 flex flex-col items-center gap-2 px-4"></div>