prostgles-server 2.0.189 → 2.0.192

package/lib/DboBuilder.ts

@@ -155,9 +155,11 @@ export type LocalParams = {
 
     returnQuery?: boolean;
 
-    nestedJoin?: {
+    nestedInsert?: {
         depth: number;
-        data: AnyObject;
+        previousData: AnyObject;
+        previousTable: string;
+        referencingColumn?: string;
     }
 }
 function replaceNonAlphaNumeric(string: string, replacement = "_"): string {
@@ -711,7 +713,7 @@ export class ViewHandler {
             };
         });
         let expectOne = false; 
-        paths.map(({ source, target, on }, i) => {
+        // paths.map(({ source, target, on }, i) => {
             // if(expectOne && on.length === 1){
             //     const sourceCol = on[0][1];
             //     const targetCol = on[0][0];
@@ -721,7 +723,7 @@ export class ViewHandler {
             //     console.log({ sourceCol, targetCol, sCol, source, tCol, target, on})
             //     expectOne = sCol.is_pkey && tCol.is_pkey
             // }
-        })
+        // })
         return {
             paths,
             expectOne
@@ -739,31 +741,30 @@ export class ViewHandler {
 
         let has_media: "one" | "many" | undefined = undefined;
 
-        /**
-         * Media is directly related to this table (does not come from a deeply joined table)
-         */ 
-        let has_direct_media = false;
-
         const mediaTable = this.dboBuilder.prostgles?.opts?.fileTable?.tableName;
         
         if(!this.is_media && mediaTable){
-            if(this.dboBuilder.prostgles?.opts?.fileTable?.referencedTables?.[this.name]){
-                has_media = this.dboBuilder.prostgles?.opts?.fileTable?.referencedTables?.[this.name];
-                has_direct_media = true;
+            const joinConf = this.dboBuilder.prostgles?.opts?.fileTable?.referencedTables?.[this.name]
+            if(joinConf){
+                has_media = typeof joinConf === "string"? joinConf : "one";
             } else {
                 const jp = this.dboBuilder.joinPaths.find(jp => jp.t1 === this.name && jp.t2 === mediaTable);
                 if(jp && jp.path.length <= 3){
-                    await Promise.all(jp.path.map(async tableName => {
-                        const cols = (await this?.dboBuilder?.dbo?.[tableName]?.getColumns?.())?.filter(c => jp.path.includes(c?.references?.ftable as any));
-                        if(cols && cols.length && has_media !== "many"){
-                            if(cols.find(c => !c.is_pkey)){
-                                has_media = "many"
-                            } else {
-                                has_media = "one"
+                    if(jp.path.length <= 2){
+                        has_media = "one"
+                    } else {
+                        await Promise.all(jp.path.map(async tableName => {
+                            const pkeyFcols = this?.dboBuilder?.dbo?.[tableName]?.columns?.filter(c => c.is_pkey).map(c => c.name);
+                            const cols = this?.dboBuilder?.dbo?.[tableName]?.columns?.filter(c => c?.references && jp.path.includes(c?.references?.ftable));
+                            if(cols && cols.length && has_media !== "many"){
+                                if(cols.some(c => !pkeyFcols?.includes(c.name))){
+                                    has_media = "many"
+                                } else {
+                                    has_media = "one"
+                                }
                             }
-                            has_direct_media = jp.path.length === 2;
-                        }
-                    }));
+                        }));
+                    }
                 }
             }
         }
@@ -774,7 +775,6 @@ export class ViewHandler {
             info: this.dboBuilder.prostgles?.tableConfigurator?.getTableInfo({ tableName: this.name, lang }),
             is_media: this.is_media,      // this.name === this.dboBuilder.prostgles?.opts?.fileTable?.tableName
             has_media,
-            has_direct_media,
             media_table_name: mediaTable,
             dynamicRules: {
                 update: Boolean(tableRules?.update?.dynamicFields?.length)
@@ -831,7 +831,11 @@ export class ViewHandler {
                     _delete = this.tableOrViewInfo.privileges.delete;// c.privileges.some(p => p.privilege_type === "DELETE");
                 
                 delete (c as any).privileges;
-                let result = {
+
+                const prostgles = this.dboBuilder?.prostgles;
+                const fileConfig = prostgles.fileManager?.getColInfo({ colName: c.name, tableName: this.name })
+
+                let result: ValidatedColumnInfo = {
                     ...c,
                     label,
                     tsDataType: postgresToTsType(c.udt_name),
@@ -840,7 +844,8 @@ export class ViewHandler {
                     filter: Boolean(p.select && p.select.filterFields && p.select.filterFields.includes(c.name)),
                     update: update && Boolean(p.update && p.update.fields && p.update.fields.includes(c.name)),
                     delete: _delete && Boolean(p.delete && p.delete.filterFields && p.delete.filterFields.includes(c.name)),
-                    ...(this.dboBuilder?.prostgles?.tableConfigurator?.getColInfo({ table: this.name, col: c.name, lang }) || {})
+                    ...(prostgles?.tableConfigurator?.getColInfo({ table: this.name, col: c.name, lang }) || {}),
+                    ...(fileConfig && { file: fileConfig })
                 }
 
                 if(dynamicUpdateFields){
@@ -1828,10 +1833,10 @@ export class ViewHandler {
     * @param {FieldFilter} fieldParams - { col1: 0, col2: 0 } | { col1: true, col2: true } | "*" | ["key1", "key2"] | []
     * @param {boolean} allow_empty - allow empty select. defaults to true
     */
-    static _parseFieldFilter(fieldParams: FieldFilter = "*", allow_empty: boolean = true, all_cols: string[]): string[] {
+    static _parseFieldFilter<AllowedKeys extends string[]>(fieldParams: FieldFilter<Record<AllowedKeys[number], any>> = "*", allow_empty: boolean = true, all_cols: AllowedKeys): AllowedKeys | [""] {
         if(!all_cols) throw "all_cols missing"
         const all_fields = all_cols;// || this.column_names.slice(0);
-        let colNames: string[] = [],
+        let colNames: AllowedKeys = [] as any,
             initialParams = JSON.stringify(fieldParams);
 
         if(fieldParams){
@@ -1849,7 +1854,7 @@ export class ViewHandler {
                     ["*"] 
                 */
                 if(fieldParams[0] === "*"){
-                    return all_fields.slice(0);
+                    return all_fields.slice(0) as typeof all_fields;
 
                 /* 
                     [""] 
@@ -1864,7 +1869,7 @@ export class ViewHandler {
                     ["field1", "field2", "field3"] 
                 */
                 } else {
-                    colNames = fieldParams.slice(0);
+                    colNames = fieldParams.slice(0) as AllowedKeys;
                 }
 
             /*
@@ -1873,10 +1878,10 @@ export class ViewHandler {
             */
             } else if(isPlainObject(fieldParams)){
 
-                if(Object.keys(fieldParams).length){
-                    let keys = Object.keys(fieldParams as {
+                if(getKeys(fieldParams).length){
+                    let keys = getKeys(fieldParams as {
                         [key: string]: boolean | 0 | 1;
-                    });
+                    }) as AllowedKeys;
                     if(keys[0] === ""){ 
                         if(allow_empty){
                             return [""];
@@ -1897,12 +1902,12 @@ export class ViewHandler {
 
 
                     if(disallowed && disallowed.length){
-                        return all_fields.filter(col => !disallowed.includes(col));
+                        return all_fields.filter(col => !disallowed.includes(col)) as typeof all_fields;
                     } else {
-                        return [...allowed];
+                        return [...allowed] as any;
                     }
                 } else {
-                    return all_fields.slice(0);
+                    return all_fields.slice(0) as typeof all_fields;
                 }
             } else {
                 throw " Unrecognised field filter.\nExpecting any of:   string | string[] | { [field]: boolean } \n Received ->  " + initialParams;
@@ -1910,9 +1915,9 @@ export class ViewHandler {
 
             validate(colNames);
         }
-        return colNames;
+        return colNames as any;
 
-        function validate(cols: string[]){
+        function validate(cols: AllowedKeys){
             let bad_keys = cols.filter(col => !all_fields.includes(col));
             if(bad_keys && bad_keys.length){
                 throw "\nUnrecognised or illegal fields: " + bad_keys.join(", ");
@@ -2759,39 +2764,13 @@ export class DboBuilder {
         return this.joinPaths;
     }
 
-    buildJoinPaths(){
-        
-    }
-
     async build(): Promise<DBHandlerServer>{
 
-        // await this.pubSubManager.init()
-
-        this.tablesOrViews = await getTablesForSchemaPostgresSQL(this.db);  //, this.schema
-        // console.log(this.tablesOrViews.map(t => `${t.name} (${t.columns.map(c => c.name).join(", ")})`))
+        this.tablesOrViews = await getTablesForSchemaPostgresSQL(this.db);
 
         this.constraints = await getConstraints(this.db);
         await this.parseJoins();
 
-//         const common_types = 
-// `
-
-// import { ViewHandler, TableHandler, JoinMaker } from "prostgles-types";
-
-// export type TxCB = {
-//     (t: DBObj): (any | void | Promise<(any | void)>)
-// };
-
-// `
-        // this.dboDefinition = `export type DBObj = {\n`;
-
-
-        // let joinTableNames: string[] = [];
-
-        // let allDataDefs = "";
-            
-            
-
         this.tablesOrViews.map(tov => {
             const columnsForTypes = tov.columns.slice(0).sort((a, b) => a.name.localeCompare(b.name));
             
@@ -2803,26 +2782,12 @@ export class DboBuilder {
                 Please provide a replacement keyword name using the $filter_keyName init option. 
                 Alternatively you can rename the table column\n`;
             }
-
-            const TSTableDataName = snakify(tov.name, true);
-            const TSTableHandlerName = escapeTSNames(tov.name)
-            if(tov.is_view){
-                this.dbo[tov.name] = new ViewHandler(this.db, tov, this, undefined, undefined, this.joinPaths);
-                // this.dboDefinition  += `  ${TSTableHandlerName}: ViewHandler<${TSTableDataName}> \n`;
-            } else {
-                this.dbo[tov.name] = new TableHandler(this.db, tov, this, undefined, undefined, this.joinPaths);
-                // this.dboDefinition  += `  ${TSTableHandlerName}: TableHandler<${TSTableDataName}> \n`;
-            }
-            // allDataDefs += `export type ${TSTableDataName} = { \n` + 
-            //     (this.dbo[tov.name] as ViewHandler).tsColumnDefs.map(str => `  ` + str).join("\n") +
-            //     `\n}\n`;
-
-            // this.dboDefinition += ` ${escapeTSNames(tov.name, false)}: ${(this.dbo[tov.name] as TableHandler).tsDboName};\n`;
+            
+            this.dbo[tov.name] = new (tov.is_view? ViewHandler : TableHandler)(this.db, tov, this, undefined, undefined, this.joinPaths);
 
             if(this.joinPaths && this.joinPaths.find(jp => [jp.t1, jp.t2].includes(tov.name))){
 
                 let table = tov.name;
-                // joinTableNames.push(table);
 
                 const makeJoin = (
                     isLeft = true, 
@@ -2856,19 +2821,6 @@ export class DboBuilder {
             }
         });
 
-        // let joinBuilderDef = "";
-        // if(joinTableNames.length){
-        //     joinBuilderDef += "export type JoinMakerTables = {\n";
-        //     joinTableNames.map(tname => {
-        //         joinBuilderDef += ` ${escapeTSNames(tname)}: JoinMaker<${snakify(tname, true)}>;\n`
-        //     })
-        //     joinBuilderDef += "};\n";
-        //     ["leftJoin", "innerJoin", "leftJoinOne", "innerJoinOne"].map(joinType => {
-        //         this.dboDefinition += `  ${joinType}: JoinMakerTables;\n`;
-        //     });
-        // }
-
-
         if(this.prostgles.opts.transactions){
             let txKey = "tx";
             if(typeof this.prostgles.opts.transactions === "string") txKey = this.prostgles.opts.transactions;
@@ -2879,7 +2831,7 @@ export class DboBuilder {
 
         if(!this.dbo.sql){
 
-            let needType = true;// this.publishRawSQL && typeof this.publishRawSQL === "function";
+            let needType = true;
             let DATA_TYPES: {oid: string, typname: PG_COLUMN_UDT_DATA_TYPE }[] = !needType? [] : await this.db.any("SELECT oid, typname FROM pg_type");
             let USER_TABLES: { relid: string; relname: string; }[] = !needType? [] :  await this.db.any("SELECT relid, relname FROM pg_catalog.pg_statio_user_tables");
 
@@ -2985,39 +2937,21 @@ export class DboBuilder {
         this.dboDefinition += "};\n";
         
         this.tsTypesDefinition = [
-            // common_types, 
             `/* SCHEMA DEFINITON. Table names have been altered to work with Typescript */`,
-            // allDataDefs, 
-            // joinBuilderDef,
-            
-            `/* DBO Definition. Isomorphic */`,
-            // this.dboDefinition,
+            `/* DBO Definition */`,
             getDBSchema(this)
         ].join("\n");
 
         return this.dbo;
-            // let dbo = makeDBO(db, allTablesViews, pubSubManager, true);
     }
 
     getTX = (cb: TxCB) => {
         return this.db.tx((t) => {
             let dbTX: TableHandlers = {};
             this.tablesOrViews?.map(tov => {
-                if(tov.is_view){
-
-                    dbTX[tov.name] = new ViewHandler(this.db, tov, this, t, dbTX, this.joinPaths);
-                } else {
-                    dbTX[tov.name] = new TableHandler(this.db, tov, this, t, dbTX, this.joinPaths);
-                
-                    /**
-                     * Pass only the transaction object to ensure consistency
-                     */
-                    //     dbTX[tov.name] = new ViewHandler(t, tov, this.pubSubManager, this, t, this.joinPaths);
-                    // } else {
-                    //     dbTX[tov.name] = new TableHandler(t as any, tov, this.pubSubManager, this, t, this.joinPaths);
-                }
+                dbTX[tov.name] = new (tov.is_view? ViewHandler: TableHandler)(this.db, tov, this, t, dbTX, this.joinPaths);
             });
-            Object.keys(dbTX).map(k => {
+            getKeys(dbTX).map(k => {
                 dbTX[k].dbTX = dbTX;
             })
             return cb(dbTX, t);
@@ -3216,16 +3150,6 @@ async function getTablesForSchemaPostgresSQL(db: DB, schema: string = "public"):
     // console.log(pgp.as.format(query, { schema }), schema);
     let res: TableSchema[] = await db.any(query, { schema });
 
-    // res = await Promise.all(res.map(async tbl => {
-    //     tbl.columns = await Promise.all(tbl.columns.map(async col => {
-    //         if(col.has_default){
-    //             col.column_default = !col.column_default.startsWith("nextval(")? (await db.oneOrNone(`SELECT ${col.column_default} as val`)).val : null;
-    //         }
-    //         return col;
-    //     }))
-        
-    //     return tbl;
-    // }))
     res = res.map(tbl => {
         tbl.columns = tbl.columns.map(col => {
             if(col.has_default){
@@ -3245,10 +3169,8 @@ async function getTablesForSchemaPostgresSQL(db: DB, schema: string = "public"):
 
 /** 
 * Throw error if illegal keys found in object
-* @param {Object} obj - Object to be checked
-* @param {string[]} allowedKeys - The name of the employee.
 */
-function validateObj(obj: object, allowedKeys: string[]): object{
+function validateObj<T extends Record<string, any>>(obj: T, allowedKeys: string[]): T {
     if(obj && Object.keys(obj).length){
         const invalid_keys = Object.keys(obj).filter(k => !allowedKeys.includes(k));
         if(invalid_keys.length){ 
@@ -3526,15 +3448,20 @@ function sqlErrCodeToMsg(code: string){
 }
 
 
-async function getInferredJoins2(schema: TableSchema[]): Promise<Join[]>{
+async function getInferredJoins2(schema: TableSchema[]): Promise<Join[]> {
     let joins: Join[] = [];
-    const upsertJoin = (t1: string, t2: string, cols: { col1: string; col2: string }[]) => {
+    const upsertJoin = (t1: string, t2: string, cols: { col1: string; col2: string }[], type: Join["type"]) => {
         let existingIdx = joins.findIndex(j => j.tables.slice(0).sort().join() === [t1, t2].sort().join());
         let existing = joins[existingIdx];
         const normalCond = cols.reduce((a, v) => ({ ...a, [v.col1]: v.col2 }), {});
         const revertedCond = cols.reduce((a, v) => ({ ...a, [v.col2]: v.col1 }), {});
         if(existing){
-            const cond = existing.tables[0] === t1? normalCond : revertedCond;
+            const isLTR = existing.tables[0] === t1
+            const cond = isLTR? normalCond : revertedCond;
+
+            /** At some point we should add relationship type to EACH JOIN CONDITION GROUP */
+            // const fixedType = isLTR? type : type.split("").reverse().join("") as Join["type"];
+
             /** Avoid duplicates */
             if(!existing.on.some(_cond => JSON.stringify(_cond) === JSON.stringify(cond))){
                 existing.on.push(cond);
@@ -3544,7 +3471,7 @@ async function getInferredJoins2(schema: TableSchema[]): Promise<Join[]>{
             joins.push({
                 tables: [t1, t2],
                 on: [normalCond],
-                type: "many-many"
+                type
             })
         }
     }
@@ -3552,56 +3479,15 @@ async function getInferredJoins2(schema: TableSchema[]): Promise<Join[]>{
         tov.columns.map(col => {
             if(col.references){
                 const r = col.references;
-                upsertJoin(tov.name, r.ftable, r.cols.map((c, i) => ({ col1: c, col2: r.fcols[i] })))
+                const joinCols = r.cols.map((c, i) => ({ col1: c, col2: r.fcols[i] }));
+                let type: Join["type"] = "one-many";
+                const ftablePkeys = schema.find(_tov => _tov.name === r.ftable)?.columns.filter(fcol => fcol.is_pkey);
+                if(ftablePkeys?.length && ftablePkeys.every(fkey => r.fcols.includes(fkey.name))){
+                    type = "one-one";
+                }
+                upsertJoin(tov.name, r.ftable, joinCols, type)
             }
         })
     })
     return joins;
-}
-// async function getInferredJoins(db: DB, schema: string = "public"): Promise<Join[]>{
-//     let joins: Join[] = [];
-//     let res = await db.any(`SELECT
-//             tc.table_schema, 
-//             tc.constraint_name, 
-//             tc.table_name, 
-//             kcu.column_name, 
-//             ccu.table_schema AS foreign_table_schema,
-//             ccu.table_name AS foreign_table_name,
-//             ccu.column_name AS foreign_column_name,
-//             tc.constraint_type IN ('UNIQUE', 'PRIMARY KEY') as foreign_is_unique
-//         FROM 
-//             information_schema.table_constraints AS tc 
-//             JOIN information_schema.key_column_usage AS kcu
-//             ON tc.constraint_name = kcu.constraint_name
-//             AND tc.table_schema = kcu.table_schema
-//             JOIN information_schema.constraint_column_usage AS ccu
-//             ON ccu.constraint_name = tc.constraint_name
-//             AND ccu.table_schema = tc.table_schema
-//         WHERE tc.table_schema=` + "${schema}" + ` 
-//         AND tc.constraint_type = 'FOREIGN KEY' 
-//         AND tc.table_name <> ccu.table_name -- Exclude self-referencing tables
-//     `, { schema });
-        
-//     res.map((d: any) => {
-//         let eIdx = joins.findIndex(j => j.tables.includes(d.table_name) && j.tables.includes(d.foreign_table_name));
-//         let existing = joins[eIdx];
-//         if(existing){
-//             if(existing.tables[0] === d.table_name){
-//                 existing.on = { ...existing.on,  [d.column_name]:  d.foreign_column_name }
-//             } else {
-//                 existing.on = { ...existing.on,  [d.foreign_column_name]:  d.column_name }
-//             }
-//             joins[eIdx] = existing;
-//         } else {
-//             joins.push({
-//                 tables: [d.table_name, d.foreign_table_name],
-//                 on: {
-//                     [d.column_name]:  d.foreign_column_name 
-//                 },
-//                 type: "many-many"
-//             })
-//         }
-//     });
-    
-//     return joins;
-// }
+}

package/lib/FileManager.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { S3 } from 'aws-sdk';
 import { DB, DBHandlerServer, Prostgles } from './Prostgles';
+import { ALLOWED_CONTENT_TYPE, ALLOWED_EXTENSION, ValidatedColumnInfo } from 'prostgles-types';
 export declare const asSQLIdentifier: (name: string, db: DB) => Promise<string>;
 export declare type ImageOptions = {
     keepMetadata?: boolean;
@@ -60,10 +61,14 @@ export default class FileManager {
     tableName?: string;
     private fileRoute?;
     constructor(config: FileManager["config"], imageOptions?: ImageOptions);
-    getMIME(file: Buffer | String, fileName: string, allowedExtensions?: Array<ALLOWED_EXTENSION>, dissallowedExtensions?: Array<ALLOWED_EXTENSION>, onlyFromName?: boolean): Promise<{
-        mime: string;
-        ext: string | ALLOWED_EXTENSION;
+    parseFile(args: {
+        file: Buffer | string;
         fileName: string;
+        colName?: string;
+        tableName?: string;
+    }): Promise<{
+        mime: string | ALLOWED_CONTENT_TYPE;
+        ext: string | ALLOWED_EXTENSION;
     }>;
     private upload;
     uploadAsMedia: (params: {
@@ -74,77 +79,20 @@ export default class FileManager {
     }) => Promise<UploadedItem>;
     private getFileURL;
     private parseSQLIdentifier;
+    getColInfo: (args: {
+        tableName: string;
+        colName: string;
+    }) => ValidatedColumnInfo["file"] | undefined;
     init: (prg: Prostgles) => Promise<void>;
 }
-declare const CONTENT_TYPE_TO_EXT: {
-    readonly "text/html": readonly ["html", "htm", "shtml"];
-    readonly "text/css": readonly ["css"];
-    readonly "text/xml": readonly ["xml"];
-    readonly "text/mathml": readonly ["mml"];
-    readonly "text/plain": readonly ["txt"];
-    readonly "text/vnd.sun.j2me.app-descriptor": readonly ["jad"];
-    readonly "text/vnd.wap.wml": readonly ["wml"];
-    readonly "text/x-component": readonly ["htc"];
-    readonly "image/gif": readonly ["gif"];
-    readonly "image/jpeg": readonly ["jpeg", "jpg"];
-    readonly "image/png": readonly ["png"];
-    readonly "image/tiff": readonly ["tif", "tiff"];
-    readonly "image/vnd.wap.wbmp": readonly ["wbmp"];
-    readonly "image/x-icon": readonly ["ico"];
-    readonly "image/x-jng": readonly ["jng"];
-    readonly "image/x-ms-bmp": readonly ["bmp"];
-    readonly "image/svg+xml": readonly ["svg"];
-    readonly "image/webp": readonly ["webp"];
-    readonly "application/x-javascript": readonly ["js"];
-    readonly "application/atom+xml": readonly ["atom"];
-    readonly "application/rss+xml": readonly ["rss"];
-    readonly "application/java-archive": readonly ["jar", "war", "ear"];
-    readonly "application/mac-binhex40": readonly ["hqx"];
-    readonly "application/msword": readonly ["doc", "docx"];
-    readonly "application/pdf": readonly ["pdf"];
-    readonly "application/postscript": readonly ["ps", "eps", "ai"];
-    readonly "application/rtf": readonly ["rtf"];
-    readonly "application/vnd.ms-excel": readonly ["xls", "xlsx"];
-    readonly "application/vnd.ms-powerpoint": readonly ["ppt", "pptx"];
-    readonly "application/vnd.wap.wmlc": readonly ["wmlc"];
-    readonly "application/vnd.google-earth.kml+xml": readonly ["kml"];
-    readonly "application/vnd.google-earth.kmz": readonly ["kmz"];
-    readonly "application/x-7z-compressed": readonly ["7z"];
-    readonly "application/x-cocoa": readonly ["cco"];
-    readonly "application/x-java-archive-diff": readonly ["jardiff"];
-    readonly "application/x-java-jnlp-file": readonly ["jnlp"];
-    readonly "application/x-makeself": readonly ["run"];
-    readonly "application/x-perl": readonly ["pl", "pm"];
-    readonly "application/x-pilot": readonly ["prc", "pdb"];
-    readonly "application/x-rar-compressed": readonly ["rar"];
-    readonly "application/x-redhat-package-manager": readonly ["rpm"];
-    readonly "application/x-sea": readonly ["sea"];
-    readonly "application/x-shockwave-flash": readonly ["swf"];
-    readonly "application/x-stuffit": readonly ["sit"];
-    readonly "application/x-tcl": readonly ["tcl", "tk"];
-    readonly "application/x-x509-ca-cert": readonly ["der", "pem", "crt"];
-    readonly "application/x-xpinstall": readonly ["xpi"];
-    readonly "application/xhtml+xml": readonly ["xhtml"];
-    readonly "application/zip": readonly ["zip"];
-    readonly "application/octet-stream": readonly ["bin", "exe", "dll", "deb", "dmg", "eot", "iso", "img", "msi", "msp", "msm"];
-    readonly "audio/midi": readonly ["mid", "midi", "kar"];
-    readonly "audio/mpeg": readonly ["mp3"];
-    readonly "audio/ogg": readonly ["ogg"];
-    readonly "audio/x-realaudio": readonly ["ra"];
-    readonly "video/3gpp": readonly ["3gpp", "3gp"];
-    readonly "video/mpeg": readonly ["mpeg", "mpg"];
-    readonly "video/quicktime": readonly ["mov"];
-    readonly "video/x-flv": readonly ["flv"];
-    readonly "video/x-mng": readonly ["mng"];
-    readonly "video/x-ms-asf": readonly ["asx", "asf"];
-    readonly "video/x-ms-wmv": readonly ["wmv"];
-    readonly "video/x-msvideo": readonly ["avi"];
-    readonly "video/mp4": readonly ["m4v", "mp4"];
-    readonly "video/webm": readonly ["webm"];
+export declare const getFileTypeFromFilename: (fileName: string) => {
+    mime: ALLOWED_CONTENT_TYPE;
+    ext: ALLOWED_EXTENSION;
 };
-export declare type ALLOWED_CONTENT_TYPE = keyof typeof CONTENT_TYPE_TO_EXT;
-export declare type ALLOWED_EXTENSION = (typeof CONTENT_TYPE_TO_EXT)[ALLOWED_CONTENT_TYPE][number];
-export {};
+export declare const getFileType: (file: Buffer | string, fileName: string) => Promise<{
+    mime: ALLOWED_CONTENT_TYPE;
+    ext: ALLOWED_EXTENSION;
+}>;
 /**
  *
  

package/lib/FileManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["FileManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["FileManager.ts"],"names":[],"mappings":"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"}