Merge branch 'beforeUpdates'

packages/api/src/controllers/plugins.js

@@ -9,10 +9,17 @@ const requirePlugin = require('../shell/requirePlugin');
 const downloadPackage = require('../utility/downloadPackage');
 const hasPermission = require('../utility/hasPermission');
 const _ = require('lodash');
+const packagedPluginsContent = require('../packagedPluginsContent');
 
 module.exports = {
   script_meta: 'get',
   async script({ packageName }) {
+    const packagedContent = packagedPluginsContent();
+
+    if (packagedContent && packagedContent[packageName]) {
+      return packagedContent[packageName].frontend;
+    }
+
     const file1 = path.join(packagedPluginsDir(), packageName, 'dist', 'frontend.js');
     const file2 = path.join(pluginsdir(), packageName, 'dist', 'frontend.js');
     // @ts-ignore
@@ -58,26 +65,37 @@ module.exports = {
 
   installed_meta: 'get',
   async installed() {
-    const files1 = await fs.readdir(packagedPluginsDir());
+    const packagedContent = packagedPluginsContent();
+
+    const files1 = packagedContent ? _.keys(packagedContent) : await fs.readdir(packagedPluginsDir());
     const files2 = await fs.readdir(pluginsdir());
 
     const res = [];
     for (const packageName of _.union(files1, files2)) {
       if (!/^dbgate-plugin-.*$/.test(packageName)) continue;
       try {
-        const isPackaged = files1.includes(packageName);
-        const manifest = await fs
-          .readFile(path.join(isPackaged ? packagedPluginsDir() : pluginsdir(), packageName, 'package.json'), {
-            encoding: 'utf-8',
-          })
-          .then(x => JSON.parse(x));
-        const readmeFile = path.join(isPackaged ? packagedPluginsDir() : pluginsdir(), packageName, 'README.md');
-        // @ts-ignore
-        if (await fs.exists(readmeFile)) {
-          manifest.readme = await fs.readFile(readmeFile, { encoding: 'utf-8' });
+        if (packagedContent && packagedContent[packageName]) {
+          const manifest = {
+            ...packagedContent[packageName].manifest,
+          };
+          manifest.isPackaged = true;
+          manifest.readme = packagedContent[packageName].readme;
+          res.push(manifest);
+        } else {
+          const isPackaged = files1.includes(packageName);
+          const manifest = await fs
+            .readFile(path.join(isPackaged ? packagedPluginsDir() : pluginsdir(), packageName, 'package.json'), {
+              encoding: 'utf-8',
+            })
+            .then(x => JSON.parse(x));
+          const readmeFile = path.join(isPackaged ? packagedPluginsDir() : pluginsdir(), packageName, 'README.md');
+          // @ts-ignore
+          if (await fs.exists(readmeFile)) {
+            manifest.readme = await fs.readFile(readmeFile, { encoding: 'utf-8' });
+          }
+          manifest.isPackaged = isPackaged;
+          res.push(manifest);
         }
-        manifest.isPackaged = isPackaged;
-        res.push(manifest);
       } catch (err) {
         console.log(`Skipped plugin ${packageName}, error:`, err.message);
       }

packages/api/src/index.js

@@ -1,5 +1,8 @@
 const shell = require('./shell');
 const processArgs = require('./utility/processArgs');
+const dbgateTools = require('dbgate-tools');
+
+global['DBGATE_TOOLS'] = dbgateTools;
 
 if (processArgs.startProcess) {
   const proc = require('./proc');

packages/tools/src/DatabaseAnalyser.ts

@@ -2,7 +2,7 @@ import { DatabaseInfo, DatabaseModification, EngineDriver } from 'dbgate-types';
 import _sortBy from 'lodash/sortBy';
 import _groupBy from 'lodash/groupBy';
 import _pick from 'lodash/pick';
-import _ from 'lodash';
+import _compact from 'lodash/compact';
 
 const fp_pick = arg => array => _pick(array, arg);
 export class DatabaseAnalyser {
@@ -134,7 +134,7 @@ export class DatabaseAnalyser {
     return this.structure[objectTypeField]
       .filter(x => !items.find(y => x.objectId == y.objectId))
       .map(x => ({
-        oldName: _.pick(x, ['schemaName', 'pureName']),
+        oldName: _pick(x, ['schemaName', 'pureName']),
         objectId: x.objectId,
         action: 'remove',
         objectTypeField,
@@ -175,7 +175,7 @@ export class DatabaseAnalyser {
         const action = obj
           ? {
               newName: { schemaName, pureName },
-              oldName: _.pick(obj, ['schemaName', 'pureName']),
+              oldName: _pick(obj, ['schemaName', 'pureName']),
               action: 'change',
               objectTypeField: field,
               objectId,
@@ -189,7 +189,7 @@ export class DatabaseAnalyser {
         res.push(action);
       }
 
-      return [..._.compact(res), ...this.getDeletedObjects(snapshot)];
+      return [..._compact(res), ...this.getDeletedObjects(snapshot)];
     }
   }
 

packages/tools/src/SqlGenerator.ts

@@ -7,7 +7,8 @@ import {
   TriggerInfo,
   ViewInfo,
 } from 'dbgate-types';
-import _ from 'lodash';
+import _flatten from 'lodash/flatten';
+import _uniqBy from 'lodash/uniqBy'
 import { SqlDumper } from './SqlDumper';
 import { extendDatabaseInfo } from './structureTools';
 
@@ -122,9 +123,9 @@ export class SqlGenerator {
 
   createForeignKeys() {
     const fks = [];
-    if (this.options.createForeignKeys) fks.push(..._.flatten(this.tables.map(x => x.foreignKeys || [])));
-    if (this.options.createReferences) fks.push(..._.flatten(this.tables.map(x => x.dependencies || [])));
-    for (const fk of _.uniqBy(fks, 'constraintName')) {
+    if (this.options.createForeignKeys) fks.push(..._flatten(this.tables.map(x => x.foreignKeys || [])));
+    if (this.options.createReferences) fks.push(..._flatten(this.tables.map(x => x.dependencies || [])));
+    for (const fk of _uniqBy(fks, 'constraintName')) {
       this.dmp.createForeignKey(fk);
       if (this.checkDumper()) return;
     }
@@ -152,7 +153,7 @@ export class SqlGenerator {
       }
     }
     if (this.options.createIndexes) {
-      for (const index of _.flatten(this.tables.map(x => x.indexes || []))) {
+      for (const index of _flatten(this.tables.map(x => x.indexes || []))) {
         this.dmp.createIndex(index);
       }
     }
@@ -204,7 +205,7 @@ export class SqlGenerator {
 
   dropTables() {
     if (this.options.dropReferences) {
-      for (const fk of _.flatten(this.tables.map(x => x.dependencies || []))) {
+      for (const fk of _flatten(this.tables.map(x => x.dependencies || []))) {
         this.dmp.dropForeignKey(fk);
       }
     }

packages/tools/src/settingsExtractors.ts

@@ -1,11 +1,12 @@
-import _ from 'lodash';
+import _isNaN from 'lodash/isNaN';
+import _isNumber from 'lodash/isNumber';
 
 export function extractIntSettingsValue(settings, name, defaultValue, min = null, max = null) {
   const parsed = parseInt(settings[name]);
-  if (_.isNaN(parsed)) {
+  if (_isNaN(parsed)) {
     return defaultValue;
   }
-  if (_.isNumber(parsed)) {
+  if (_isNumber(parsed)) {
     if (min != null && parsed < min) return min;
     if (max != null && parsed > max) return max;
     return parsed;

packages/tools/src/structureTools.ts

@@ -1,8 +1,8 @@
 import { DatabaseInfo } from 'dbgate-types';
-import _ from 'lodash';
+import _flatten from 'lodash/flatten';
 
 export function addTableDependencies(db: DatabaseInfo): DatabaseInfo {
-  const allForeignKeys = _.flatten(db.tables.map(x => x.foreignKeys || []));
+  const allForeignKeys = _flatten(db.tables.map(x => x.foreignKeys || []));
   return {
     ...db,
     tables: db.tables.map(table => ({

packages/web/public/index.html

@@ -21,9 +21,25 @@
 	<link rel='stylesheet' href='build/fonts/materialdesignicons.css'>
 
 	<script defer src='build/bundle.js'></script>
+
+	<style>
+		#starting_dbgate_zero {
+			position: absolute;
+			left: 0;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			display: flex;
+			align-items: center;
+			justify-content: space-around;
+		}
+	</style>
 </head>
 
 <body>
+	<div id='starting_dbgate_zero'>
+		Loading DbGate App ...
+	</div>
 </body>
 
 </html>

packages/web/src/App.svelte

@@ -33,6 +33,11 @@
 
   onMount(loadApi);
 
+  onMount(() => {
+    const removed = document.getElementById('starting_dbgate_zero');
+    if (removed) removed.remove();
+  });
+
   $: {
     if (loadedApi && $loadingPluginStore?.loaded) {
       setAppLoaded();
@@ -51,7 +56,12 @@
     <OpenTabsOnStartup />
     <Screen />
   {:else}
-    <LoadingInfo message={`Loading plugin ${$loadingPluginStore.loadingPackageName}`} wrapper />
+    <LoadingInfo
+      message={$loadingPluginStore.loadingPackageName
+        ? `Loading plugin ${$loadingPluginStore.loadingPackageName} ...`
+        : 'Preparing plugins ...'}
+      wrapper
+    />
   {/if}
 {:else}
   <LoadingInfo message="Starting DbGate ..." wrapper />

packages/web/src/plugins/PluginsProvider.svelte

@@ -4,6 +4,8 @@
   };
 
   async function loadPlugins(pluginsDict, installedPlugins) {
+    window['DBGATE_TOOLS'] = dbgateTools;
+
     const newPlugins = {};
     for (const installed of installedPlugins || []) {
       if (!_.keys(pluginsDict).includes(installed.name)) {
@@ -63,6 +65,7 @@
   import { useInstalledPlugins } from '../utility/metadataLoaders';
   import { buildFileFormats } from './fileformats';
   import { buildThemes } from './themes';
+  import dbgateTools from 'dbgate-tools';
 
   let pluginsDict = {};
   const installedPlugins = useInstalledPlugins();