prostgles-server 1.5.122 → 2.0.3

package/lib/PubSubManager.ts

@@ -837,7 +837,7 @@ export class PubSubManager {
     prepareTriggers = async () => {
         // SELECT * FROM pg_catalog.pg_event_trigger WHERE evtname
         if(!this.appID) throw "prepareTriggers failed: this.appID missing";
-        if(this.dboBuilder.prostgles.watchSchema && !(await isSuperUser(this.db))){
+        if(this.dboBuilder.prostgles.opts.watchSchema && !(await isSuperUser(this.db))){
             console.warn("prostgles watchSchema requires superuser db user. Will not watch")
         }
 

package/lib/QueryBuilder.ts

@@ -830,7 +830,7 @@ export async function getNewQuery(
   localParams?: LocalParams
 ): Promise<NewQuery> {
 
-  if(get(localParams, "socket") && !get(tableRules, "select.fields")){
+  if((localParams?.socket || localParams?.httpReq) && !get(tableRules, "select.fields")){
     throw `INTERNAL ERROR: publish.${_this.name}.select.fields rule missing`;
   }
 
@@ -915,9 +915,9 @@ export async function getNewQuery(
     }
 
     let isLocal = true;
-    if(localParams && localParams.socket){
+    if(localParams && (localParams.socket || localParams.httpReq)){
       isLocal = false;
-      j_tableRules = await _this.dboBuilder.publishParser.getValidatedRequestRuleWusr({ tableName: j_table, command: "find", socket: localParams.socket });
+      j_tableRules = await _this.dboBuilder.publishParser.getValidatedRequestRuleWusr({ tableName: j_table, command: "find", localParams });
     }
     
     if(isLocal || j_tableRules){
@@ -1005,7 +1005,8 @@ export function makeQuery(
 
   // const indent = (a, b) => a;
   const joinTables = (q1: NewQuery, q2: NewQuery): string[] => {
-    const paths = _this.getJoins(q1.table, q2.table, q2.$path);
+    const joinInfo = _this.getJoins(q1.table, q2.table, q2.$path);
+    const paths = joinInfo.paths;
 
     return flat(paths.map(({ table, on }, i) => {
       const getPrevColName = (col: string) => {
@@ -1015,13 +1016,16 @@ export function makeQuery(
         return table === q2.table? q2.select.find(s => s.getQuery() === asName(col)).alias : col;
       }
 
+      // console.log(JSON.stringify({i, table, on, q1, q2}, null, 2));
+
       const prevTable = i === 0? q1.table : (paths[i - 1].table);
       const thisAlias = makePrefANON(q2.tableAlias, table);
-      const prevAlias = i === 0? makePrefAN(q1) : thisAlias;
+      // const prevAlias = i === 0? makePrefAN(q1) : thisAlias;
+      const prevAlias =  i === 0? makePrefAN(q1) : makePrefANON(q2.tableAlias, prevTable)
       // If root then prev table is aliased from root query. Alias from join otherwise
 
       let iQ = [
-          asName(table) + ` ${thisAlias}`
+        asName(table) + ` ${thisAlias}`
       ];
 
       /* If target table then add filters, options, etc */

package/lib/index.ts

@@ -1,9 +1,9 @@
 import { Prostgles, ProstglesInitOptions } from "./Prostgles";
-import { TableHandler, ViewHandler } from "./DboBuilder";
+import { DbHandler, TableHandler, ViewHandler } from "./DboBuilder";
 
-function prostgles(params: ProstglesInitOptions){
+function prostgles<DBObj = DbHandler>(params: ProstglesInitOptions<DBObj>){
 
-    let prgl = new Prostgles(params);
+    let prgl = new Prostgles<DBObj>(params as any);
     return prgl.init(params.onReady);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "1.5.122",
+  "version": "2.0.3",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,11 +24,17 @@
   },
   "homepage": "https://github.com/prostgles/prostgles-server-js#readme",
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.34.0",
+    "aws-sdk": "^2.996.0",
     "bluebird": "^3.7.2",
+    "file-type": "^16.5.3",
     "pg-promise": "^10.9.5",
-    "prostgles-types": "^1.5.96"
+    "prostgles-types": "^1.5.101",
+    "sharp": "^0.29.1"
   },
   "devDependencies": {
+    "@aws-sdk/types": "^3.34.0",
+    "@types/file-type": "^10.9.1",
     "@types/node": "^14.14.35",
     "typescript": "^3.9.7"
   }

package/tests/client/index.js

@@ -12,12 +12,12 @@ const log = (msg, extra) => {
     console.log(...[`(client) t+ ${(Date.now() - start)}ms ` + msg, extra].filter(v => v));
 };
 log("Started client...");
-const url = process.env.PRGL_CLIENT_URL || "http://127.0.0.1:3001", path = process.env.PRGL_CLIENT_PATH || "/teztz/s", socket = socket_io_client_1.default(url, { path, query: { token: "haha" } }), //  
+const url = process.env.PRGL_CLIENT_URL || "http://127.0.0.1:3001", path = process.env.PRGL_CLIENT_PATH || "/teztz/s", socket = (0, socket_io_client_1.default)(url, { path, query: { token: "haha" } }), //  
 stopTest = (err) => {
-    socket.emit("stop-test", !err ? err : { err: err.toString() }, cb => {
+    socket.emit("stop-test", !err ? err : { err: err.toString(), error: err }, cb => {
         log("Stopping client...");
         if (err)
-            console.error(err);
+            console.trace(err);
         setTimeout(() => {
             process.exit(err ? 1 : 0);
         }, 1000);
@@ -36,7 +36,7 @@ try {
     });
     socket.on("start-test", (data) => {
         log("start-test", data);
-        prostgles_client_1.default({
+        (0, prostgles_client_1.default)({
             socket,
             onReconnect: (socket) => {
                 log("Reconnected");
@@ -45,19 +45,31 @@ try {
                 log("onReady.auth", auth);
                 try {
                     log("Starting Client isomorphic tests");
-                    await isomorphic_queries_1.default(db);
+                    // try {
+                    await (0, isomorphic_queries_1.default)(db);
+                    // } catch(e){
+                    //   throw { isoErr: e }
+                    // }
                     log("Client isomorphic tests successful");
-                    await client_only_queries_1.default(db, auth, log, methods);
+                    // try {
+                    await (0, client_only_queries_1.default)(db, auth, log, methods);
+                    // } catch(e){
+                    //   throw { ClientErr: e }
+                    // }
                     log("Client-only replication tests successful");
                     stopTest();
                 }
                 catch (err) {
+                    console.trace(err);
                     stopTest(err);
+                    throw err;
                 }
             }
         });
     });
 }
 catch (e) {
+    console.trace(e);
     stopTest(e);
+    throw e;
 }

package/tests/client/index.ts

@@ -15,10 +15,10 @@ const url = process.env.PRGL_CLIENT_URL || "http://127.0.0.1:3001",
   path = process.env.PRGL_CLIENT_PATH || "/teztz/s",
   socket = io(url, { path, query: { token: "haha" }  }), //  
   stopTest = (err?) => {
-    socket.emit("stop-test", !err? err : { err: err.toString() }, cb => {
+    socket.emit("stop-test", !err? err : { err: err.toString(), error: err }, cb => {
 
       log("Stopping client...");
-      if(err) console.error(err);
+      if(err) console.trace(err);
   
       setTimeout(() => {
         process.exit(err? 1 : 0)
@@ -50,17 +50,27 @@ try {
         log("onReady.auth", auth)
         try {
           log("Starting Client isomorphic tests")
-          await isomorphic(db);
+          // try {
+            await isomorphic(db);
+          // } catch(e){
+          //   throw { isoErr: e }
+          // }
           log("Client isomorphic tests successful")
   
-          await client_only(db, auth, log, methods);
+          // try {
+            await client_only(db, auth, log, methods);
+          // } catch(e){
+          //   throw { ClientErr: e }
+          // }
           log("Client-only replication tests successful")
   
   
           stopTest();
 
         } catch (err){
+          console.trace(err)
           stopTest(err);
+          throw err;
         }
       }
     }); 
@@ -68,6 +78,8 @@ try {
   })
 
 } catch(e) {
+  console.trace(e)
   stopTest(e);
+  throw e;
 }
  

package/tests/client/package-lock.json

@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "client",
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
@@ -21,14 +22,14 @@
       "integrity": "sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg=="
     },
     "node_modules/@types/node": {
-      "version": "14.14.20",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz",
-      "integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A=="
+      "version": "14.17.18",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.18.tgz",
+      "integrity": "sha512-haYyibw4pbteEhkSg0xdDLAI3679L75EJ799ymVrPxOA922bPx3ML59SoDsQ//rHlvqpu+e36kcbR3XRQtFblA=="
     },
     "node_modules/@types/socket.io-client": {
-      "version": "1.4.35",
-      "resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.35.tgz",
-      "integrity": "sha512-MI8YmxFS+jMkIziycT5ickBWK1sZwDwy16mgH/j99Mcom6zRG/NimNGQ3vJV0uX5G6g/hEw0FG3w3b3sT5OUGw=="
+      "version": "1.4.36",
+      "resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.36.tgz",
+      "integrity": "sha512-ZJWjtFBeBy1kRSYpVbeGYTElf6BqPQUkXDlHHD4k/42byCN5Rh027f4yARHCink9sKAkbtGZXEAmR0ZCnc2/Ag=="
     },
     "node_modules/backo2": {
       "version": "1.0.2",
@@ -113,17 +114,17 @@
       "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
     },
     "node_modules/prostgles-client": {
-      "version": "1.5.105",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.105.tgz",
-      "integrity": "sha512-F4l3z5M+NQTKuxsNXmkRP7amTj1ywK0GuQx14WNzqgEaIHWYpahm3cxJ2NFmKfUzRJ3PMD1ddUfi76D6dJphFA==",
+      "version": "1.5.106",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.106.tgz",
+      "integrity": "sha512-hCeL9E2bfu9pquiwfi0nAuOEvoSzUYHjYAOEcG+rWWv+LzaL3PCM9T6J4mzxUuLHnyVDET8/UWhxp9uVbgXo0w==",
       "dependencies": {
-        "prostgles-types": "^1.5.95"
+        "prostgles-types": "^1.5.96"
       }
     },
     "node_modules/prostgles-types": {
-      "version": "1.5.95",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.95.tgz",
-      "integrity": "sha512-dpocEQbCLr5UfL5/Ly1rsbypV7j2ohjZji3JYQw+loO1brtc68by1koykuPG0ZseCNhs1sWf6CNiIKI+L2Rdag=="
+      "version": "1.5.96",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.96.tgz",
+      "integrity": "sha512-JQo4yBG2f+x/nhKQfnjcZGqQEXUdSCUL8ohdz4rrcoxDZf8aiBD0RSEAOfh8ar/70D5Vr9xhoKlnxA4zF/8oMA=="
     },
     "node_modules/socket.io-client": {
       "version": "4.2.0",
@@ -196,14 +197,14 @@
       "integrity": "sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg=="
     },
     "@types/node": {
-      "version": "14.14.20",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz",
-      "integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A=="
+      "version": "14.17.18",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.18.tgz",
+      "integrity": "sha512-haYyibw4pbteEhkSg0xdDLAI3679L75EJ799ymVrPxOA922bPx3ML59SoDsQ//rHlvqpu+e36kcbR3XRQtFblA=="
     },
     "@types/socket.io-client": {
-      "version": "1.4.35",
-      "resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.35.tgz",
-      "integrity": "sha512-MI8YmxFS+jMkIziycT5ickBWK1sZwDwy16mgH/j99Mcom6zRG/NimNGQ3vJV0uX5G6g/hEw0FG3w3b3sT5OUGw=="
+      "version": "1.4.36",
+      "resolved": "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.36.tgz",
+      "integrity": "sha512-ZJWjtFBeBy1kRSYpVbeGYTElf6BqPQUkXDlHHD4k/42byCN5Rh027f4yARHCink9sKAkbtGZXEAmR0ZCnc2/Ag=="
     },
     "backo2": {
       "version": "1.0.2",
@@ -274,17 +275,17 @@
       "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
     },
     "prostgles-client": {
-      "version": "1.5.105",
-      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.105.tgz",
-      "integrity": "sha512-F4l3z5M+NQTKuxsNXmkRP7amTj1ywK0GuQx14WNzqgEaIHWYpahm3cxJ2NFmKfUzRJ3PMD1ddUfi76D6dJphFA==",
+      "version": "1.5.106",
+      "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.106.tgz",
+      "integrity": "sha512-hCeL9E2bfu9pquiwfi0nAuOEvoSzUYHjYAOEcG+rWWv+LzaL3PCM9T6J4mzxUuLHnyVDET8/UWhxp9uVbgXo0w==",
       "requires": {
-        "prostgles-types": "^1.5.95"
+        "prostgles-types": "^1.5.96"
       }
     },
     "prostgles-types": {
-      "version": "1.5.95",
-      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.95.tgz",
-      "integrity": "sha512-dpocEQbCLr5UfL5/Ly1rsbypV7j2ohjZji3JYQw+loO1brtc68by1koykuPG0ZseCNhs1sWf6CNiIKI+L2Rdag=="
+      "version": "1.5.96",
+      "resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.96.tgz",
+      "integrity": "sha512-JQo4yBG2f+x/nhKQfnjcZGqQEXUdSCUL8ohdz4rrcoxDZf8aiBD0RSEAOfh8ar/70D5Vr9xhoKlnxA4zF/8oMA=="
     },
     "socket.io-client": {
       "version": "4.2.0",

package/tests/client/package.json

@@ -7,7 +7,7 @@
     "start": "tsc-watch --onSuccess \"node index.js\"",
     "dev": "NOSTOP=true npm start",
     "build": "rm -rf ./node_modules/* && npm i && tsc",
-    "test": "node index.js"
+    "test": "node index.js "
   },
   "author": "",
   "license": "ISC",

package/tests/client_only_queries.js

@@ -18,7 +18,7 @@ async function client_only(db, auth, log, methods) {
             // console.log(fullResult)
             assert_1.strict.deepStrictEqual(fullResult.rows[0], { col1: 1 }, "db.sql query failed");
             assert_1.strict.deepStrictEqual(fullResult.fields, [{ name: 'col1', tableID: 0, columnID: 0, dataTypeID: 23, dataTypeSize: 4, dataTypeModifier: -1, format: 'text', dataType: 'int4' }], "db.sql query failed");
-            await isomorphic_queries_1.tryRunP("sql LISTEN NOTIFY events", async (resolve, reject) => {
+            await (0, isomorphic_queries_1.tryRunP)("sql LISTEN NOTIFY events", async (resolve, reject) => {
                 const sub = await db.sql("LISTEN chnl ");
                 // console.log({ sub })
                 sub.addListener(notif => {
@@ -30,7 +30,7 @@ async function client_only(db, auth, log, methods) {
                 });
                 db.sql("NOTIFY chnl , 'hello'; ");
             });
-            await isomorphic_queries_1.tryRunP("sql NOTICE events", async (resolve, reject) => {
+            await (0, isomorphic_queries_1.tryRunP)("sql NOTICE events", async (resolve, reject) => {
                 const sub = await db.sql("", {}, { returnType: "noticeSubscription" });
                 // console.log({ sub })
                 sub.addListener(notice => {
@@ -105,7 +105,7 @@ async function client_only(db, auth, log, methods) {
     if (!auth.user) {
         log("Checking public data");
         // Public data
-        await isomorphic_queries_1.tryRun("Security rules example", async () => {
+        await (0, isomorphic_queries_1.tryRun)("Security rules example", async () => {
             const vQ = await db.items4.find({}, { select: { added: 0 } });
             assert_1.strict.deepStrictEqual(vQ, [
                 { id: 1, public: 'public data' },
@@ -119,7 +119,7 @@ async function client_only(db, auth, log, methods) {
     else {
         log("Checking User data");
         // User data
-        await isomorphic_queries_1.tryRun("Security rules example", async () => {
+        await (0, isomorphic_queries_1.tryRun)("Security rules example", async () => {
             const vQ = await db.items4.find();
             assert_1.strict.deepStrictEqual(vQ, [
                 { id: 1, public: 'public data' },

package/tests/config_test/DBoGenerated.d.ts

@@ -25,6 +25,11 @@ export type Ex_j_ins = {
   "name"?: string;
   "added"?: Date;
 }
+export type I18n_languages = { 
+  "id"?: string;
+  "label"?: string;
+  "label_en"?: string;
+}
 export type Item_children = { 
   "id"?: number;
   "item_id"?: number;
@@ -33,8 +38,8 @@ export type Item_children = {
 }
 export type Items = { 
   "id"?: number;
+  "h"?: Array<string>;
   "name"?: string;
-  "tst"?: Date;
 }
 export type Items2 = { 
   "id"?: number;
@@ -59,6 +64,37 @@ export type Items4_pub = {
   "name"?: string;
   "added"?: Date;
 }
+export type Items_m1 = { 
+  "id"?: number;
+  "media_id"?: string;
+  "name"?: string;
+}
+export type Items_with_media = { 
+  "id"?: number;
+  "name"?: string;
+}
+export type Items_with_one_media = { 
+  "id"?: number;
+  "name"?: string;
+}
+export type Lookup_status = { 
+  "id"?: string;
+  "en"?: string;
+  "fr"?: string;
+}
+export type Media = { 
+  "id"?: string;
+  "name"?: string;
+  "extension"?: string;
+  "content_type"?: string;
+  "url"?: string;
+  "original_name"?: string;
+  "description"?: string;
+  "s3_url"?: string;
+  "signed_url"?: string;
+  "signed_url_expires"?: number;
+  "etag"?: string;
+}
 export type Planes = { 
   "id"?: number;
   "x"?: number;
@@ -66,13 +102,63 @@ export type Planes = {
   "flight_number"?: string;
   "last_updated"?: number;
 }
-export type V_various = { 
+export type Prgll = { 
+  "foreign_id"?: number;
+  "media_id"?: string;
+}
+export type Prostgles_lookup_media_items_with_media = { 
+  "foreign_id"?: number;
+  "media_id"?: string;
+}
+export type Prostgles_lookup_media_items_with_one_media = { 
+  "foreign_id"?: number;
+  "media_id"?: string;
+}
+export type Prostgles_lookup_media_various = { 
+  "foreign_id"?: number;
+  "media_id"?: string;
+}
+export type T = { 
+  "t"?: string;
+}
+export type Test = { 
   "id"?: number;
-  "h"?: Array<string>;
-  "name"?: string;
-  "tsv"?: any;
-  "jsn"?: Object;
+  "parent"?: number;
+}
+export type Tr1 = { 
+  "id"?: number;
+  "t1"?: string;
+}
+export type Tr2 = { 
+  "id"?: number;
+  "tr1_id"?: number;
+  "t1"?: string;
+  "t2"?: string;
+}
+export type Tt = { 
+  "id"?: number;
+  "t1"?: string;
+  "t2"?: string;
+}
+export type Tt1 = { 
+  "id"?: number;
+  "t1"?: string;
+  "t2"?: string;
+}
+export type Tttt = { 
+  "t"?: string;
+}
+export type Usr = { 
+  "id"?: number;
+  "status"?: string;
+  "msg"?: string;
   "added"?: Date;
+  "is_active"?: boolean;
+  "age"?: number;
+}
+export type V_items = { 
+  "id"?: number;
+  "name"?: string;
 }
 export type Various = { 
   "id"?: number;
@@ -82,10 +168,27 @@ export type Various = {
   "jsn"?: Object;
   "added"?: Date;
 }
+export type Various_nested = { 
+  "various_id"?: number;
+}
 
 export type JoinMakerTables = {
- "item_children": JoinMaker<Item_children>;
  "items": JoinMaker<Items>;
+ "items2": JoinMaker<Items2>;
+ "items_m1": JoinMaker<Items_m1>;
+ "items_with_media": JoinMaker<Items_with_media>;
+ "items_with_one_media": JoinMaker<Items_with_one_media>;
+ "lookup_status": JoinMaker<Lookup_status>;
+ "media": JoinMaker<Media>;
+ "prostgles_lookup_media_items_with_media": JoinMaker<Prostgles_lookup_media_items_with_media>;
+ "prostgles_lookup_media_items_with_one_media": JoinMaker<Prostgles_lookup_media_items_with_one_media>;
+ "prostgles_lookup_media_various": JoinMaker<Prostgles_lookup_media_various>;
+ "tr1": JoinMaker<Tr1>;
+ "tr2": JoinMaker<Tr2>;
+ "tt": JoinMaker<Tt>;
+ "tt1": JoinMaker<Tt1>;
+ "usr": JoinMaker<Usr>;
+ "various": JoinMaker<Various>;
 };
 
 /* DBO Definition. Isomorphic */
@@ -93,17 +196,137 @@ export type DBObj = {
   "\"*\"": TableHandler<D_34_42_34> 
   "*": TableHandler<D_42> 
   "ex_j_ins": TableHandler<Ex_j_ins> 
+  "i18n_languages": TableHandler<I18n_languages> 
   "item_children": TableHandler<Item_children> 
   "items": TableHandler<Items> 
   "items2": TableHandler<Items2> 
   "items3": TableHandler<Items3> 
   "items4": TableHandler<Items4> 
   "items4_pub": TableHandler<Items4_pub> 
+  "items_m1": TableHandler<Items_m1> 
+  "items_with_media": TableHandler<Items_with_media> 
+  "items_with_one_media": TableHandler<Items_with_one_media> 
+  "lookup_status": TableHandler<Lookup_status> 
+  "media": TableHandler<Media> 
   "planes": TableHandler<Planes> 
-  "v_various": ViewHandler<V_various> 
+  "prgll": TableHandler<Prgll> 
+  "prostgles_lookup_media_items_with_media": TableHandler<Prostgles_lookup_media_items_with_media> 
+  "prostgles_lookup_media_items_with_one_media": TableHandler<Prostgles_lookup_media_items_with_one_media> 
+  "prostgles_lookup_media_various": TableHandler<Prostgles_lookup_media_various> 
+  "t": TableHandler<T> 
+  "test": TableHandler<Test> 
+  "tr1": TableHandler<Tr1> 
+  "tr2": TableHandler<Tr2> 
+  "tt": TableHandler<Tt> 
+  "tt1": TableHandler<Tt1> 
+  "tttt": TableHandler<Tttt> 
+  "usr": TableHandler<Usr> 
+  "v_items": ViewHandler<V_items> 
   "various": TableHandler<Various> 
+  "various_nested": TableHandler<Various_nested> 
   leftJoin: JoinMakerTables;
   innerJoin: JoinMakerTables;
   leftJoinOne: JoinMakerTables;
   innerJoinOne: JoinMakerTables;
+ tx: (t: TxCB) => Promise<any | void> ;
 };
+
+type DeepPartial<T> = { [P in keyof T]?: DeepPartial<T[P]>; }; 
+export type I18N_DBO_CONFIG<LANG_IDS = { en: 1, fr: 1 }> = { 
+  fallbackLang: keyof LANG_IDS; 
+  column_labels?: DeepPartial<{ 
+    "\"*\"": { 
+      [key in "id" | "\"*\""]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "*": { 
+      [key in "id" | "*"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "ex_j_ins": { 
+      [key in "id" | "public" | "name" | "added"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "i18n_languages": { 
+      [key in "id" | "label" | "label_en"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "item_children": { 
+      [key in "id" | "item_id" | "name" | "tst"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "items": { 
+      [key in "id" | "h" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "items2": { 
+      [key in "id" | "items_id" | "hh" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "items3": { 
+      [key in "id" | "h" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "items4": { 
+      [key in "id" | "public" | "name" | "added"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "items4_pub": { 
+      [key in "id" | "public" | "name" | "added"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "items_m1": { 
+      [key in "id" | "media_id" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "items_with_media": { 
+      [key in "id" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "items_with_one_media": { 
+      [key in "id" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "lookup_status": { 
+      [key in "id" | "en" | "fr"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "media": { 
+      [key in "id" | "name" | "extension" | "content_type" | "url" | "original_name" | "description" | "s3_url" | "signed_url" | "signed_url_expires" | "etag"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "planes": { 
+      [key in "id" | "x" | "y" | "flight_number" | "last_updated"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "prgll": { 
+      [key in "foreign_id" | "media_id"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "prostgles_lookup_media_items_with_media": { 
+      [key in "foreign_id" | "media_id"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "prostgles_lookup_media_items_with_one_media": { 
+      [key in "foreign_id" | "media_id"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "prostgles_lookup_media_various": { 
+      [key in "foreign_id" | "media_id"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "t": { 
+      [key in "t"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "test": { 
+      [key in "id" | "parent"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "tr1": { 
+      [key in "id" | "t1"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "tr2": { 
+      [key in "id" | "tr1_id" | "t1" | "t2"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "tt": { 
+      [key in "id" | "t1" | "t2"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "tt1": { 
+      [key in "id" | "t1" | "t2"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "tttt": { 
+      [key in "t"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "usr": { 
+      [key in "id" | "status" | "msg" | "added" | "is_active" | "age"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "v_items": { 
+      [key in "id" | "name"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "various": { 
+      [key in "id" | "h" | "name" | "tsv" | "jsn" | "added"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+    "various_nested": { 
+      [key in "various_id"]: { [lang_id in keyof LANG_IDS]: string }; 
+    }; 
+  }> 
+}