extensions refactor

packages/web/src/impexp/ImportExportConfigurator.js

@@ -12,10 +12,10 @@ import {
   FormArchiveFolderSelect,
   FormArchiveFilesSelect,
 } from '../utility/forms';
-import { useArchiveFiles, useConnectionInfo, useDatabaseInfo } from '../utility/metadataLoaders';
+import { useArchiveFiles, useConnectionInfo, useDatabaseInfo, useInstalledPlugins } from '../utility/metadataLoaders';
 import TableControl, { TableColumn } from '../utility/TableControl';
 import { TextField, SelectField, CheckboxField } from '../utility/inputs';
-import { createPreviewReader, getActionOptions, getTargetName, isFileStorage } from './createImpExpScript';
+import { createPreviewReader, getActionOptions, getTargetName } from './createImpExpScript';
 import getElectron from '../utility/getElectron';
 import ErrorInfo from '../widgets/ErrorInfo';
 import getAsArray from '../utility/getAsArray';
@@ -25,8 +25,9 @@ import SqlEditor from '../sqleditor/SqlEditor';
 import { useUploadsProvider } from '../utility/UploadsProvider';
 import { FontIcon } from '../icons';
 import useTheme from '../theme/useTheme';
-import { fileformats, findFileFormat, getFileFormatDirections } from '../fileformats';
+import { findFileFormat, getFileFormatDirections } from '../utility/fileformats';
 import FormArgumentList from '../utility/FormArgumentList';
+import useExtensions from '../utility/useExtensions';
 
 const Container = styled.div`
   // max-height: 50vh;
@@ -89,9 +90,9 @@ const Title = styled.div`
   margin: 10px 0px;
 `;
 
-function getFileFilters(storageType) {
+function getFileFilters(extensions, storageType) {
   const res = [];
-  const format = findFileFormat(storageType);
+  const format = findFileFormat(extensions, storageType);
   if (format) res.push({ name: format.name, extensions: [format.extension] });
   res.push({ name: 'All Files', extensions: ['*'] });
   return res;
@@ -105,12 +106,12 @@ async function addFilesToSourceListDefault(file, newSources, newValues) {
   };
 }
 
-async function addFilesToSourceList(files, values, setValues, preferedStorageType, setPreviewSource) {
+async function addFilesToSourceList(extensions, files, values, setValues, preferedStorageType, setPreviewSource) {
   const newSources = [];
   const newValues = {};
   const storage = preferedStorageType || values.sourceStorageType;
   for (const file of getAsArray(files)) {
-    const format = findFileFormat(storage);
+    const format = findFileFormat(extensions, storage);
     if (format) {
       await (format.addFilesToSourceList || addFilesToSourceListDefault)(file, newSources, newValues);
     }
@@ -132,17 +133,19 @@ function ElectronFilesInput() {
   const { values, setValues } = useFormikContext();
   const electron = getElectron();
   const [isLoading, setIsLoading] = React.useState(false);
+  const extensions = useExtensions();
 
   const handleClick = async () => {
     const files = electron.remote.dialog.showOpenDialogSync(electron.remote.getCurrentWindow(), {
       properties: ['openFile', 'multiSelections'],
-      filters: getFileFilters(values.sourceStorageType),
+      filters: getFileFilters(extensions, values.sourceStorageType),
     });
     if (files) {
       const path = window.require('path');
       try {
         setIsLoading(true);
         await addFilesToSourceList(
+          extensions,
           files.map((full) => ({
             full,
             ...path.parse(full),
@@ -183,6 +186,7 @@ function SourceTargetConfig({
   tablesField = undefined,
   engine = undefined,
 }) {
+  const extensions = useExtensions();
   const theme = useTheme();
   const { values, setFieldValue } = useFormikContext();
   const types =
@@ -190,7 +194,7 @@ function SourceTargetConfig({
       ? [{ value: 'jsldata', label: 'Query result data', directions: ['source'] }]
       : [
           { value: 'database', label: 'Database', directions: ['source', 'target'] },
-          ...fileformats.map((format) => ({
+          ...extensions.fileFormats.map((format) => ({
             value: format.storageType,
             label: `${format.name} files(s)`,
             directions: getFileFormatDirections(format),
@@ -201,7 +205,7 @@ function SourceTargetConfig({
   const storageType = values[storageTypeField];
   const dbinfo = useDatabaseInfo({ conid: values[connectionIdField], database: values[databaseNameField] });
   const archiveFiles = useArchiveFiles({ folder: values[archiveFolderField] });
-  const format = findFileFormat(storageType);
+  const format = findFileFormat(extensions, storageType);
   return (
     <Column>
       {direction == 'source' && (
@@ -348,10 +352,17 @@ export default function ImportExportConfigurator({ uploadedFile = undefined, onC
   const { setUploadListener } = useUploadsProvider();
   const theme = useTheme();
   const [previewSource, setPreviewSource] = React.useState(null);
+  const extensions = useExtensions();
+
+  console.log('ImportExportConfigurator', extensions);
+  const installed = useInstalledPlugins();
+  console.log('installed', installed);
 
   const handleUpload = React.useCallback(
     (file) => {
+      console.log('UPLOAD', extensions);
       addFilesToSourceList(
+        extensions,
         [
           {
             full: file.filePath,
@@ -365,7 +376,7 @@ export default function ImportExportConfigurator({ uploadedFile = undefined, onC
       );
       // setFieldValue('sourceList', [...(sourceList || []), file.originalName]);
     },
-    [setFieldValue, sourceList, values]
+    [extensions, setFieldValue, sourceList, values]
   );
 
   React.useEffect(() => {
@@ -381,11 +392,11 @@ export default function ImportExportConfigurator({ uploadedFile = undefined, onC
     }
   }, []);
 
-  const supportsPreview = !!findFileFormat(values.sourceStorageType);
+  const supportsPreview = !!findFileFormat(extensions, values.sourceStorageType);
 
   const handleChangePreviewSource = async () => {
     if (previewSource && supportsPreview) {
-      const reader = await createPreviewReader(values, previewSource);
+      const reader = await createPreviewReader(extensions, values, previewSource);
       if (onChangePreview) onChangePreview(reader);
     } else {
       onChangePreview(null);
@@ -444,8 +455,8 @@ export default function ImportExportConfigurator({ uploadedFile = undefined, onC
             header="Action"
             formatter={(row) => (
               <SelectField
-                options={getActionOptions(row, values, targetDbinfo)}
-                value={values[`actionType_${row}`] || getActionOptions(row, values, targetDbinfo)[0].value}
+                options={getActionOptions(extensions, row, values, targetDbinfo)}
+                value={values[`actionType_${row}`] || getActionOptions(extensions, row, values, targetDbinfo)[0].value}
                 onChange={(e) => setFieldValue(`actionType_${row}`, e.target.value)}
               />
             )}
@@ -455,7 +466,7 @@ export default function ImportExportConfigurator({ uploadedFile = undefined, onC
             header="Target"
             formatter={(row) => (
               <TextField
-                value={getTargetName(row, values)}
+                value={getTargetName(extensions, row, values)}
                 onChange={(e) => setFieldValue(`targetName_${row}`, e.target.value)}
               />
             )}

packages/web/src/impexp/createImpExpScript.js

@@ -4,12 +4,12 @@ import getAsArray from '../utility/getAsArray';
 import { getConnectionInfo } from '../utility/metadataLoaders';
 import engines from 'dbgate-engines';
 import { findObjectLike } from 'dbgate-tools';
-import { findFileFormat } from '../fileformats';
+import { findFileFormat } from '../utility/fileformats';
 
-export function getTargetName(source, values) {
+export function getTargetName(extensions, source, values) {
   const key = `targetName_${source}`;
   if (values[key]) return values[key];
-  const format = findFileFormat(values.targetStorageType);
+  const format = findFileFormat(extensions, values.targetStorageType);
   if (format) {
     const res = format.getDefaultOutputName ? format.getDefaultOutputName(source, values) : null;
     if (res) return res;
@@ -18,10 +18,6 @@ export function getTargetName(source, values) {
   return source;
 }
 
-export function isFileStorage(storageType) {
-  return !!findFileFormat(storageType);
-}
-
 function extractApiParameters(values, direction, format) {
   const pairs = (format.args || [])
     .filter((arg) => arg.apiName)
@@ -45,7 +41,7 @@ async function getConnection(storageType, conid, database) {
   return [null, null];
 }
 
-function getSourceExpr(sourceName, values, sourceConnection, sourceDriver) {
+function getSourceExpr(extensions, sourceName, values, sourceConnection, sourceDriver) {
   const { sourceStorageType } = values;
   if (sourceStorageType == 'database') {
     const fullName = { schemaName: values.sourceSchemaName, pureName: sourceName };
@@ -66,9 +62,9 @@ function getSourceExpr(sourceName, values, sourceConnection, sourceDriver) {
       },
     ];
   }
-  if (isFileStorage(sourceStorageType)) {
+  if (findFileFormat(extensions, sourceStorageType)) {
     const sourceFile = values[`sourceFile_${sourceName}`];
-    const format = findFileFormat(sourceStorageType);
+    const format = findFileFormat(extensions, sourceStorageType);
     if (format && format.readerFunc) {
       return [
         format.readerFunc,
@@ -113,9 +109,9 @@ function getFlagsFroAction(action) {
   };
 }
 
-function getTargetExpr(sourceName, values, targetConnection, targetDriver) {
+function getTargetExpr(extensions, sourceName, values, targetConnection, targetDriver) {
   const { targetStorageType } = values;
-  const format = findFileFormat(targetStorageType);
+  const format = findFileFormat(extensions, targetStorageType);
   if (format && format.writerFunc) {
     const outputParams = format.getOutputParams && format.getOutputParams(sourceName, values);
     return [
@@ -124,7 +120,7 @@ function getTargetExpr(sourceName, values, targetConnection, targetDriver) {
         ...(outputParams
           ? outputParams
           : {
-              fileName: getTargetName(sourceName, values),
+              fileName: getTargetName(extensions, sourceName, values),
             }),
         ...extractApiParameters(values, 'target', format),
       },
@@ -136,7 +132,7 @@ function getTargetExpr(sourceName, values, targetConnection, targetDriver) {
       {
         connection: targetConnection,
         schemaName: values.targetSchemaName,
-        pureName: getTargetName(sourceName, values),
+        pureName: getTargetName(extensions, sourceName, values),
         ...getFlagsFroAction(values[`actionType_${sourceName}`]),
       },
     ];
@@ -146,7 +142,7 @@ function getTargetExpr(sourceName, values, targetConnection, targetDriver) {
       'archiveWriter',
       {
         folderName: values.targetArchiveFolder,
-        fileName: getTargetName(sourceName, values),
+        fileName: getTargetName(extensions, sourceName, values),
       },
     ];
   }
@@ -154,7 +150,7 @@ function getTargetExpr(sourceName, values, targetConnection, targetDriver) {
   throw new Error(`Unknown target storage type: ${targetStorageType}`);
 }
 
-export default async function createImpExpScript(values, addEditorInfo = true) {
+export default async function createImpExpScript(extensions, values, addEditorInfo = true) {
   const script = new ScriptWriter();
 
   const [sourceConnection, sourceDriver] = await getConnection(
@@ -172,11 +168,11 @@ export default async function createImpExpScript(values, addEditorInfo = true) {
   for (const sourceName of sourceList) {
     const sourceVar = script.allocVariable();
     // @ts-ignore
-    script.assign(sourceVar, ...getSourceExpr(sourceName, values, sourceConnection, sourceDriver));
+    script.assign(sourceVar, ...getSourceExpr(extensions, sourceName, values, sourceConnection, sourceDriver));
 
     const targetVar = script.allocVariable();
     // @ts-ignore
-    script.assign(targetVar, ...getTargetExpr(sourceName, values, targetConnection, targetDriver));
+    script.assign(targetVar, ...getTargetExpr(extensions, sourceName, values, targetConnection, targetDriver));
 
     script.copyStream(sourceVar, targetVar);
     script.put();
@@ -188,9 +184,9 @@ export default async function createImpExpScript(values, addEditorInfo = true) {
   return script.s;
 }
 
-export function getActionOptions(source, values, targetDbinfo) {
+export function getActionOptions(extensions, source, values, targetDbinfo) {
   const res = [];
-  const targetName = getTargetName(source, values);
+  const targetName = getTargetName(extensions, source, values);
   if (values.targetStorageType == 'database') {
     let existing = findObjectLike(
       { schemaName: values.targetSchemaName, pureName: targetName },
@@ -225,13 +221,13 @@ export function getActionOptions(source, values, targetDbinfo) {
   return res;
 }
 
-export async function createPreviewReader(values, sourceName) {
+export async function createPreviewReader(extensions, values, sourceName) {
   const [sourceConnection, sourceDriver] = await getConnection(
     values.sourceStorageType,
     values.sourceConnectionId,
     values.sourceDatabaseName
   );
-  const [functionName, props] = getSourceExpr(sourceName, values, sourceConnection, sourceDriver);
+  const [functionName, props] = getSourceExpr(extensions, sourceName, values, sourceConnection, sourceDriver);
   return {
     functionName,
     props: {