prostgles-server 2.0.172 → 2.0.175

package/dist/DboBuilder.js

@@ -5,7 +5,7 @@
  *--------------------------------------------------------------------------------------------*/
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.postgresToTsType = exports.isPlainObject = exports.DboBuilder = exports.TableHandler = exports.ViewHandler = exports.EXISTS_KEYS = exports.pgp = exports.getUpdateFilter = void 0;
+exports.postgresToTsType = exports.isPlainObject = exports.DboBuilder = exports.TableHandler = exports.ViewHandler = exports.EXISTS_KEYS = exports.escapeTSNames = exports.pgp = exports.getUpdateFilter = void 0;
 const Bluebird = require("bluebird");
 // declare global { export interface Promise<T> extends Bluebird<T> {} }
 const pgPromise = require("pg-promise");
@@ -54,11 +54,21 @@ function snakify(str, capitalize = false) {
         return c;
     }).join("");
 }
-function escapeTSNames(str, capitalize = true) {
+function canBeUsedAsIsInTypescript(str) {
+    if (!str)
+        return false;
+    const isAlphaNumericOrUnderline = str.match(/^[a-z0-9_]+$/i);
+    const startsWithCharOrUnderscore = str[0].match(/^[a-z_]+$/i);
+    return Boolean(isAlphaNumericOrUnderline && startsWithCharOrUnderscore);
+}
+function escapeTSNames(str, capitalize = false) {
     let res = str;
     res = (capitalize ? str[0].toUpperCase() : str[0]) + str.slice(1);
+    if (canBeUsedAsIsInTypescript(res))
+        return res;
     return JSON.stringify(res);
 }
+exports.escapeTSNames = escapeTSNames;
 const shortestPath_1 = require("./shortestPath");
 /* DEBUG CLIENT ERRORS HERE */
 function makeErr(err, localParams, view, allowedKeys) {
@@ -191,7 +201,7 @@ class ViewHandler {
         // if(this.tsDataName === "T") this.tsDataName = this.tsDataName + "_";
         // this.tsDataDef = `export type ${this.tsDataName} = {\n`;
         this.columnsForTypes.map(({ name, udt_name, is_nullable }) => {
-            this.tsColumnDefs.push(`${escapeTSNames(name, false)}?: ${postgresToTsType(udt_name)} ${is_nullable ? " | null " : ""};`);
+            this.tsColumnDefs.push(`${escapeTSNames(name)}?: ${postgresToTsType(udt_name)} ${is_nullable ? " | null " : ""};`);
         });
         // this.tsDataDef += "};";
         // this.tsDataDef += "\n";
@@ -411,7 +421,7 @@ class ViewHandler {
         };
     }
     // TODO: fix renamed table trigger problem
-    async getColumns(lang, params, param3, tableRules, localParams) {
+    async getColumns(lang, params, _param3, tableRules, localParams) {
         try {
             const p = this.getValidatedRules(tableRules, localParams);
             if (!p.getColumns)
@@ -438,21 +448,6 @@ class ViewHandler {
                 .map(_c => {
                 let c = { ..._c };
                 let label = c.comment || capitalizeFirstLetter(c.name, " ");
-                /**
-                 * Get labels from TableConfig if specified
-                 */
-                const tblConfig = this.dboBuilder.prostgles?.opts?.tableConfig?.[this.name];
-                if (tblConfig && "columns" in tblConfig) {
-                    const lbl = tblConfig?.columns[c.name]?.label;
-                    if (["string", "object"].includes(typeof lbl)) {
-                        if (typeof lbl === "string") {
-                            label = lbl;
-                        }
-                        else if (lang) {
-                            label = (lbl?.[lang]) || lbl?.en || label;
-                        }
-                    }
-                }
                 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;
                 let result = {
@@ -464,7 +459,7 @@ 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 }) || {})
+                    ...(this.dboBuilder?.prostgles?.tableConfigurator?.getColInfo({ table: this.name, col: c.name, lang }) || {})
                 };
                 if (dynamicUpdateFields) {
                     result.update = dynamicUpdateFields.includes(c.name);
@@ -2221,6 +2216,7 @@ class TableHandler extends ViewHandler {
 }
 exports.TableHandler = TableHandler;
 const Prostgles_1 = require("./Prostgles");
+const DBSchemaBuilder_1 = require("./DBSchemaBuilder");
 class DboBuilder {
     constructor(prostgles) {
         this.schema = "public";
@@ -2393,28 +2389,19 @@ class DboBuilder {
         this.tablesOrViews = await getTablesForSchemaPostgresSQL(this.db); //, this.schema
         // console.log(this.tablesOrViews.map(t => `${t.name} (${t.columns.map(c => c.name).join(", ")})`))
         this.constraints = await getConstraints(this.db);
-        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`;
         await this.parseJoins();
-        let joinTableNames = [];
-        let allDataDefs = "";
-        let i18nDef = "type DeepPartial<T> = { [P in keyof T]?: DeepPartial<T[P]>; }; \n";
-        i18nDef += "export type I18N_DBO_CONFIG<LANG_IDS = { en: 1, fr: 1 }> = { \n";
-        i18nDef += "  fallbackLang: keyof LANG_IDS; \n";
-        i18nDef += "  column_labels?: DeepPartial<{ \n";
+        //         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));
-            i18nDef += `    ${JSON.stringify(tov.name)}: { \n`;
-            i18nDef += `      [key in ${columnsForTypes.map(c => JSON.stringify(c.name)).join(" | ")}]: { [lang_id in keyof LANG_IDS]: string }; \n`;
-            i18nDef += `    }; \n`;
             const filterKeywords = Object.values(this.prostgles.keywords);
             const $filterCol = columnsForTypes.find(c => filterKeywords.includes(c.name));
             if ($filterCol) {
@@ -2423,22 +2410,22 @@ export type TxCB = {
                 Alternatively you can rename the table column\n`;
             }
             const TSTableDataName = snakify(tov.name, true);
-            const TSTableHandlerName = JSON.stringify(tov.name);
+            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`;
+                // 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`;
+                // this.dboDefinition  += `  ${TSTableHandlerName}: TableHandler<${TSTableDataName}> \n`;
             }
-            allDataDefs += `export type ${TSTableDataName} = { \n` +
-                this.dbo[tov.name].tsColumnDefs.map(str => `  ` + str).join("\n") +
-                `\n}\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`;
             if (this.joinPaths && this.joinPaths.find(jp => [jp.t1, jp.t2].includes(tov.name))) {
                 let table = tov.name;
-                joinTableNames.push(table);
+                // joinTableNames.push(table);
                 const makeJoin = (isLeft = true, filter, select, options) => {
                     return {
                         [isLeft ? "$leftJoin" : "$innerJoin"]: table,
@@ -2465,19 +2452,17 @@ export type TxCB = {
                 };
             }
         });
-        i18nDef += "  }> \n";
-        i18nDef += "} \n";
-        let joinBuilderDef = "";
-        if (joinTableNames.length) {
-            joinBuilderDef += "export type JoinMakerTables = {\n";
-            joinTableNames.map(tname => {
-                joinBuilderDef += ` ${JSON.stringify(tname)}: JoinMaker<${snakify(tname, true)}>;\n`;
-            });
-            joinBuilderDef += "};\n";
-            ["leftJoin", "innerJoin", "leftJoinOne", "innerJoinOne"].map(joinType => {
-                this.dboDefinition += `  ${joinType}: JoinMakerTables;\n`;
-            });
-        }
+        // 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")
@@ -2579,13 +2564,13 @@ export type TxCB = {
         }
         this.dboDefinition += "};\n";
         this.tsTypesDefinition = [
-            common_types,
+            // common_types, 
             `/* SCHEMA DEFINITON. Table names have been altered to work with Typescript */`,
-            allDataDefs,
-            joinBuilderDef,
+            // allDataDefs, 
+            // joinBuilderDef,
             `/* DBO Definition. Isomorphic */`,
             this.dboDefinition,
-            i18nDef,
+            (0, DBSchemaBuilder_1.getDBSchema)(this)
         ].join("\n");
         return this.dbo;
         // let dbo = makeDBO(db, allTablesViews, pubSubManager, true);