prostgles-server 2.0.188 → 2.0.191

package/lib/DboBuilder.js

@@ -390,16 +390,16 @@ class ViewHandler {
             };
         });
         let expectOne = false;
-        paths.map(({ source, target, on }, i) => {
-            // if(expectOne && on.length === 1){
-            //     const sourceCol = on[0][1];
-            //     const targetCol = on[0][0];
-            //     const sCol = this.dboBuilder.dbo[source].columns.find(c => c.name === sourceCol)
-            //     const tCol = this.dboBuilder.dbo[target].columns.find(c => c.name === targetCol)
-            //     console.log({ sourceCol, targetCol, sCol, source, tCol, target, on})
-            //     expectOne = sCol.is_pkey && tCol.is_pkey
-            // }
-        });
+        // paths.map(({ source, target, on }, i) => {
+        // if(expectOne && on.length === 1){
+        //     const sourceCol = on[0][1];
+        //     const targetCol = on[0][0];
+        //     const sCol = this.dboBuilder.dbo[source].columns.find(c => c.name === sourceCol)
+        //     const tCol = this.dboBuilder.dbo[target].columns.find(c => c.name === targetCol)
+        //     console.log({ sourceCol, targetCol, sCol, source, tCol, target, on})
+        //     expectOne = sCol.is_pkey && tCol.is_pkey
+        // }
+        // })
         return {
             paths,
             expectOne
@@ -414,31 +414,32 @@ class ViewHandler {
         if (!p.getInfo)
             throw "Not allowed";
         let has_media = 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));
-                        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;
-                        }
-                    }));
+                        }));
+                    }
                 }
             }
         }
@@ -448,7 +449,6 @@ class ViewHandler {
             info: this.dboBuilder.prostgles?.tableConfigurator?.getTableInfo({ tableName: this.name, lang }),
             is_media: this.is_media,
             has_media,
-            has_direct_media,
             media_table_name: mediaTable,
             dynamicRules: {
                 update: Boolean(tableRules?.update?.dynamicFields?.length)
@@ -485,6 +485,8 @@ class ViewHandler {
                 let label = c.comment || capitalizeFirstLetter(c.name, " ");
                 const select = c.privileges.some(p => p.privilege_type === "SELECT"), insert = c.privileges.some(p => p.privilege_type === "INSERT"), update = c.privileges.some(p => p.privilege_type === "UPDATE"), _delete = this.tableOrViewInfo.privileges.delete; // c.privileges.some(p => p.privilege_type === "DELETE");
                 delete c.privileges;
+                const prostgles = this.dboBuilder?.prostgles;
+                const fileConfig = prostgles.fileManager?.getColInfo({ colName: c.name, tableName: this.name });
                 let result = {
                     ...c,
                     label,
@@ -494,7 +496,8 @@ 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) {
                     result.update = dynamicUpdateFields.includes(c.name);
@@ -1381,8 +1384,8 @@ class ViewHandler {
                 */
             }
             else if (isPlainObject(fieldParams)) {
-                if (Object.keys(fieldParams).length) {
-                    let keys = Object.keys(fieldParams);
+                if ((0, prostgles_types_1.getKeys)(fieldParams).length) {
+                    let keys = (0, prostgles_types_1.getKeys)(fieldParams);
                     if (keys[0] === "") {
                         if (allow_empty) {
                             return [""];
@@ -1997,20 +2000,9 @@ class DboBuilder {
             return this.db.tx((t) => {
                 let dbTX = {};
                 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 => {
+                (0, prostgles_types_1.getKeys)(dbTX).map(k => {
                     dbTX[k].dbTX = dbTX;
                 });
                 return cb(dbTX, t);
@@ -2069,16 +2061,19 @@ class DboBuilder {
                 }
                 // 3 find incorrect fields
                 joins.map(({ tables, on }) => {
-                    const t1 = tables[0], t2 = tables[1], f1s = Object.keys(on), f2s = Object.values(on);
-                    [[t1, f1s], [t2, f2s]].map(v => {
-                        var t = v[0], f = v[1];
-                        let tov = this.tablesOrViews.find(_t => _t.name === t);
-                        if (!tov)
-                            throw "Table not found: " + t;
-                        const m1 = f.filter(k => !tov.columns.map(c => c.name).includes(k));
-                        if (m1 && m1.length) {
-                            throw `Table ${t}(${tov.columns.map(c => c.name).join()}) has no fields named: ${m1.join()}`;
-                        }
+                    const t1 = tables[0], t2 = tables[1];
+                    on.map(cond => {
+                        const f1s = Object.keys(cond), f2s = Object.values(cond);
+                        [[t1, f1s], [t2, f2s]].map(v => {
+                            var t = v[0], f = v[1];
+                            let tov = this.tablesOrViews.find(_t => _t.name === t);
+                            if (!tov)
+                                throw "Table not found: " + t;
+                            const m1 = f.filter(k => !tov.columns.map(c => c.name).includes(k));
+                            if (m1 && m1.length) {
+                                throw `Table ${t}(${tov.columns.map(c => c.name).join()}) has no fields named: ${m1.join()}`;
+                            }
+                        });
                     });
                 });
                 // 4 find incorrect/missing join types
@@ -2125,21 +2120,9 @@ class DboBuilder {
     buildJoinPaths() {
     }
     async build() {
-        // 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));
             const filterKeywords = Object.values(this.prostgles.keywords);
@@ -2149,23 +2132,9 @@ 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, filter, select, options) => {
                     return {
                         [isLeft ? "$leftJoin" : "$innerJoin"]: table,
@@ -2192,17 +2161,6 @@ 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")
@@ -2211,7 +2169,7 @@ class DboBuilder {
             this.dbo[txKey] = (cb) => this.getTX(cb);
         }
         if (!this.dbo.sql) {
-            let needType = true; // this.publishRawSQL && typeof this.publishRawSQL === "function";
+            let needType = true;
             let DATA_TYPES = !needType ? [] : await this.db.any("SELECT oid, typname FROM pg_type");
             let USER_TABLES = !needType ? [] : await this.db.any("SELECT relid, relname FROM pg_catalog.pg_statio_user_tables");
             this.dbo.sql = async (query, params, options, localParams) => {
@@ -2309,16 +2267,11 @@ 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 */`,
             (0, DBSchemaBuilder_1.getDBSchema)(this)
         ].join("\n");
         return this.dbo;
-        // let dbo = makeDBO(db, allTablesViews, pubSubManager, true);
     }
 }
 exports.DboBuilder = DboBuilder;
@@ -2455,15 +2408,6 @@ async function getTablesForSchemaPostgresSQL(db, schema = "public") {
     `;
     // console.log(pgp.as.format(query, { schema }), schema);
     let res = 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) {
@@ -2478,8 +2422,6 @@ async function getTablesForSchemaPostgresSQL(db, schema = "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, allowedKeys) {
     if (obj && Object.keys(obj).length) {
@@ -2753,13 +2695,16 @@ function sqlErrCodeToMsg(code) {
 }
 async function getInferredJoins2(schema) {
     let joins = [];
-    const upsertJoin = (t1, t2, cols) => {
+    const upsertJoin = (t1, t2, cols, 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);
@@ -2770,7 +2715,7 @@ async function getInferredJoins2(schema) {
             joins.push({
                 tables: [t1, t2],
                 on: [normalCond],
-                type: "many-many"
+                type
             });
         }
     };
@@ -2778,54 +2723,15 @@ async function getInferredJoins2(schema) {
         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 = "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;
-// }