removed fileformatbase

packages/types/fileformat.d.ts

@@ -0,0 +1,20 @@
+export interface FileFormatDefinition {
+    storageType: string;
+    extension: string;
+    name: string;
+    readerFunc?: string;
+    writerFunc?: string;
+    args?: any[];
+    addFilesToSourceList: (
+      file: {
+        full: string;
+      },
+      newSources: string[],
+      newValues: {
+        [key: string]: any;
+      }
+    ) => void;
+    getDefaultOutputName?: (sourceName, values) => string;
+    getOutputParams?: (sourceName, values) => any;
+  }
+  

packages/types/index.d.ts

@@ -39,3 +39,4 @@ export * from './query';
 export * from './dialect';
 export * from './dumper';
 export * from './dbtypes';
+export * from './fileformat';

packages/web/src/fileformats/csv.ts

@@ -1,8 +1,6 @@
-import fileFormatBase from './fileFormatBase';
 import { FileFormatDefinition } from './types';
 
 const csvFormat: FileFormatDefinition = {
-  ...fileFormatBase,
   storageType: 'csv',
   extension: 'csv',
   name: 'CSV',

packages/web/src/fileformats/excel.ts

@@ -1,9 +1,7 @@
 import axios from '../utility/axios';
-import fileFormatBase from './fileFormatBase';
 import { FileFormatDefinition } from './types';
 
 const excelFormat: FileFormatDefinition = {
-  ...fileFormatBase,
   storageType: 'excel',
   extension: 'xlsx',
   name: 'MS Excel',

packages/web/src/fileformats/fileFormatBase.ts

@@ -1,11 +0,0 @@
-const fileFormatBase = {
-  addFilesToSourceList: async (file, newSources, newValues) => {
-    const sourceName = file.name;
-    newSources.push(sourceName);
-    newValues[`sourceFile_${sourceName}`] = {
-      fileName: file.full,
-    };
-  },
-};
-
-export default fileFormatBase;

packages/web/src/fileformats/jsonl.ts

@@ -1,8 +1,6 @@
-import fileFormatBase from './fileFormatBase';
 import { FileFormatDefinition } from './types';
 
 const jsonlFormat: FileFormatDefinition = {
-  ...fileFormatBase,
   storageType: 'jsonl',
   extension: 'jsonl',
   name: 'JSON lines',

packages/web/src/fileformats/types.ts

@@ -5,7 +5,7 @@ export interface FileFormatDefinition {
   readerFunc?: string;
   writerFunc?: string;
   args?: any[];
-  addFilesToSourceList: (
+  addFilesToSourceList?: (
     file: {
       full: string;
     },

packages/web/src/impexp/ImportExportConfigurator.js

@@ -97,14 +97,22 @@ function getFileFilters(storageType) {
   return res;
 }
 
+async function addFilesToSourceListDefault(file, newSources, newValues) {
+  const sourceName = file.name;
+  newSources.push(sourceName);
+  newValues[`sourceFile_${sourceName}`] = {
+    fileName: file.full,
+  };
+}
+
 async function addFilesToSourceList(files, values, setValues, preferedStorageType, setPreviewSource) {
   const newSources = [];
   const newValues = {};
   const storage = preferedStorageType || values.sourceStorageType;
   for (const file of getAsArray(files)) {
     const format = findFileFormat(storage);
-    if (format && format.addFilesToSourceList) {
+    if (format) {
-      await format.addFilesToSourceList(file, newSources, newValues);
+      await (format.addFilesToSourceList || addFilesToSourceListDefault)(file, newSources, newValues);
     }
   }
   newValues['sourceList'] = [...(values.sourceList || []).filter((x) => !newSources.includes(x)), ...newSources];

packages/web/src/utility/fileformats.js

@@ -0,0 +1,6 @@
+import { usePlugins } from '../plugins/PluginsProvider';
+
+export function useFileFormats() {
+  const plugins = usePlugins();
+  return [];
+}