prostgles-server 2.0.185 → 2.0.188

package/tests/isomorphic_queries.ts

@@ -1,15 +1,16 @@
 import { strict as assert } from 'assert';
 
 import { DBHandlerServer} from "../dist/Prostgles";
-import { DBHandlerClient } from "./client/index";
+import type { DBHandlerClient } from "./client/index";
 import * as fs from "fs";
 
 export async function tryRun(desc: string, func: () => any, log?: Function){
   try {
     await func();
   } catch(err) {
-    console.error(desc + " FAILED:");
+    console.error(desc + " FAILED:", err);
     log?.("FAIL: ", err);
+    console.trace(err)
     setTimeout(() => {
       throw err;
 
@@ -42,9 +43,8 @@ export default async function isomorphic(db: Partial<DBHandlerServer> | Partial<
     await db.items3.delete({ });
     await db.items2.delete({ });
     await db.items.delete({ });
-  
   }
-  
+ 
   
   await tryRun("Prepare data", async () => {
     await db.items.insert([{ name: "a" }, { name: "a" }, { name: "b" }]);
@@ -327,6 +327,7 @@ export default async function isomorphic(db: Partial<DBHandlerServer> | Partial<
 
   await tryRunP("subscribe", async (resolve, reject) => {
     await db.various.insert({ id: 99 });
+    console.log("subscribing")
     const sub = await db.various.subscribe({ id: 99  }, {  }, async items => {
       const item = items[0];
       
@@ -562,6 +563,21 @@ export default async function isomorphic(db: Partial<DBHandlerServer> | Partial<
       // const _data = fs.readFileSync(__dirname + "/server/media/"+file.name);
       assert.equal(name, "somename.txt");
     });
+
+    // await tryRun("Media col insert", async () => {
+  
+    //   const resp = await db.items_with_media_cols.insert({ desc: "description", file_id: mediaFile }, { returning: "*" });
+      
+    //   assert.equal(
+    //     +(await db.items_with_media_cols.count(resp)),
+    //     1
+    //   );
+      
+    //   assert.equal(
+    //     +(await db.media.count({ original_name: 'sample_file.txt', id: resp.file_id })), 
+    //     1
+    //   );
+    // });
   });
 
   
@@ -724,4 +740,50 @@ export default async function isomorphic(db: Partial<DBHandlerServer> | Partial<
       throw "$rowhash query failed";
     }
   });
+
+
+  await tryRun("Reference column nested insert", async () => {
+    const nestedRow = { name: "nested_insert" };
+    const parentRow = { name: "parent insert" }
+    const pr = await db.items2.insert({ items_id: nestedRow, ...parentRow }, { returning: "*" });
+    
+    const childRows = await db.items.find(nestedRow);
+    assert.equal(childRows.length, 1);
+    assert.deepStrictEqual(await db.items2.findOne(parentRow), { hh: null, id: pr.id, ...parentRow, items_id: childRows[0].id });
+
+  });
+
+  await tryRun("Reference column deep nested insert", async () => {
+    
+    const pr = await db.items4a.insert({ 
+      items_id: { name: "it" }, 
+      items2_id: { name: "it2", items_id: { name: "it" } }, 
+      name: "it4a" 
+    }, { returning: "*" });
+    const itemsCount = await db.items.count({ name: "it" })
+    const items2Count = await db.items2.count({ name: "it2" })
+    const items4aCount = await db.items4a.count({ name: "it4a" })
+    
+    assert.equal(+itemsCount, 2);
+    assert.equal(+items2Count, 1);
+    assert.equal(+items4aCount, 1);
+    
+  });
+
+  await tryRun("Multi reference column nested insert", async () => {
+    await db.items_multi.insert({ 
+      items0_id: { name: "multi" }, 
+      items1_id: { name: "multi" }, 
+      items2_id: { name: "multi" }, 
+      items3_id: { name: "multi" }, 
+      name: "root_multi" 
+    }, { returning: "*" });
+    const itemsCount = await db.items.count({ name: "multi" })
+    const multiItem = await db.items_multi.findOne({ name: "root_multi" }, { select: { "*": 1, items: "*" } });
+    
+    assert.equal(+itemsCount, 4);
+    assert.equal(multiItem?.name, "root_multi");
+    assert.equal(multiItem?.items.filter(d => d.name === "multi").length, 4);
+    
+  });
 }

package/tests/manual_test/DBoGenerated.d.ts

@@ -0,0 +1,398 @@
+/* This file was generated by Prostgles 
+*/ 
+
+ /* SCHEMA DEFINITON. Table names have been altered to work with Typescript */
+/* DBO Definition. Isomorphic */
+
+export type DBSchemaGenerated = {
+  "\"*\"": {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      "\"*\""?: string | null;
+      id?: number
+    };
+  };
+  "*": {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      "*"?: string | null;
+      id?: number
+    };
+  };
+  ex_j_ins: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      added?: Date | null;
+      id?: number;
+      name: string;
+      public?: string | null
+    };
+  };
+  geography_columns: {
+    is_view: true;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      coord_dimension?: number | null;
+      f_geography_column?: string | null;
+      f_table_catalog?: string | null;
+      f_table_name?: string | null;
+      f_table_schema?: string | null;
+      srid?: number | null;
+      type?: string | null
+    };
+  };
+  geometry_columns: {
+    is_view: true;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      coord_dimension?: number | null;
+      f_geometry_column?: string | null;
+      f_table_catalog?: string | null;
+      f_table_name?: string | null;
+      f_table_schema?: string | null;
+      srid?: number | null;
+      type?: string | null
+    };
+  };
+  insert_rules: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      added?: Date | null;
+      id?: number;
+      name?: string | null
+    };
+  };
+  item_children: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      item_id?: number | null;
+      name?: string | null;
+      tst?: Date | null
+    };
+  };
+  items: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      h?: Array<string> | null;
+      id?: number;
+      name?: string | null
+    };
+  };
+  items_multi: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      items0_id?: number | null;
+      items1_id?: number | null;
+      items2_id?: number | null;
+      items3_id?: number | null;
+      name?: string | null
+    };
+  };
+  items_with_media: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      name?: string | null
+    };
+  };
+  items_with_one_media: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      name?: string | null
+    };
+  };
+  items2: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      hh?: Array<string> | null;
+      id?: number;
+      items_id?: number | null;
+      name?: string | null
+    };
+  };
+  items3: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      hh?: Array<string> | null;
+      id?: number;
+      items_id?: number | null;
+      items2_id?: number | null;
+      name?: string | null
+    };
+  };
+  items4: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      added?: Date | null;
+      id?: number;
+      name: string;
+      public?: string | null
+    };
+  };
+  items4_pub: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      added?: Date | null;
+      id?: number;
+      name: string;
+      public?: string | null
+    };
+  };
+  items4a: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      items_id?: number | null;
+      items2_id?: number | null;
+      name?: string | null
+    };
+  };
+  lookup_col1: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id: string
+    };
+  };
+  lookup_status: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      en?: string | null;
+      fr?: string | null;
+      id: string
+    };
+  };
+  media: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      content_type: string;
+      description?: string | null;
+      etag?: string | null;
+      extension: string;
+      id?: string;
+      name: string;
+      original_name: string;
+      s3_url?: string | null;
+      signed_url?: string | null;
+      signed_url_expires?: number | null;
+      url: string
+    };
+  };
+  obj_table: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      obj?: any | null
+    };
+  };
+  planes: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      flight_number?: string | null;
+      id?: number;
+      last_updated: number;
+      x?: number | null;
+      y?: number | null
+    };
+  };
+  prostgles_lookup_media_items_with_media: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      foreign_id?: number | null;
+      media_id: string
+    };
+  };
+  prostgles_lookup_media_items_with_one_media: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      foreign_id: number;
+      media_id: string
+    };
+  };
+  shapes: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      geog?: any | null;
+      geom?: any | null;
+      id?: string
+    };
+  };
+  spatial_ref_sys: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      auth_name?: string | null;
+      auth_srid?: number | null;
+      proj4text?: string | null;
+      srid: number;
+      srtext?: string | null
+    };
+  };
+  tr1: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      t1?: string | null
+    };
+  };
+  tr2: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      t1?: string | null;
+      t2?: string | null;
+      tr1_id?: number | null
+    };
+  };
+  usr: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      added?: Date | null;
+      age?: number | null;
+      id?: number;
+      is_active?: boolean | null;
+      msg?: string | null;
+      status?: string | null
+    };
+  };
+  uuid_text: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      col1?: string | null;
+      col2?: string | null;
+      id?: string;
+      name?: string | null
+    };
+  };
+  various: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      added?: Date | null;
+      h?: Array<string> | null;
+      id?: number;
+      jsn?: any | null;
+      name?: string | null;
+      tsv?: any | null
+    };
+  };
+  
+}

package/tests/manual_test/index.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=index.d.ts.map

package/tests/manual_test/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":""}

package/tests/{config_test2 → manual_test}/index.html

@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 		<!-- <script src="https://unpkg.com/socket.io-client@2.3.1/dist/socket.io.slim.js" type="text/javascript"></script> -->
 	
-		<script src="https://unpkg.com/socket.io-client@3.1.0/dist/socket.io.min.js" type="text/javascript"></script>
+		<script src="https://unpkg.com/socket.io-client@latest/dist/socket.io.min.js" type="text/javascript"></script>
 		<script src="https://unpkg.com/prostgles-client@latest/dist/index.js" type="text/javascript"></script>
 	</head>
 	<body>
@@ -28,18 +28,8 @@
 			// })
 			const log = console.log;
 
-			const socket = io("wss://prostgles.com", { path: "/teztz/s", reconnect: true });
-
 			
-			// socket.on("connected", () => {
-			// 	log("Client connected.")
-			// });
-			// socket.on("connect", () => {
-			// 	log("Client connect.")
-			// });
-			// socket.on("connect_failed", (err) => {
-			// 	log("connect_failed", err)
-			// })
+			const socket = io("/", { path: "/s", reconnect: true });
 
 			prostgles({
 				socket,
@@ -57,21 +47,22 @@
 						window.dbo = db;
 						window.s = socket;
 
-						// let schema = await Promise.all(Object.keys(db).filter(t => db[t].find).map(async t => ({
-						// 	table: t,
-						// 	cols: await db[t].getColumns()
-						// })))
-						// console.log("onReady", schema);
 						const d1 = document.body.querySelector(".d1"),
 							d2 = document.body.querySelector(".d2"),
 							d3 = document.body.querySelector(".d3");
 
-						db.various.subscribe({ $and: [] }, {}, d => {
-							if(d1) d1.innerText = JSON.stringify(d, null, 2)
-						})
-						db.various.subscribe({ "id.<": 75648356348 }, {}, d => {
-							if(d2) d2.innerText = JSON.stringify(d, null, 2)
-						})
+						// db.various.subscribe({ $and: [] }, {}, d => {
+						// 	if(d1) d1.innerText = JSON.stringify(d, null, 2)
+						// })
+						// db.various.subscribe({ "id.<": 75648356348 }, {}, d => {
+						// 	if(d2) d2.innerText = JSON.stringify(d, null, 2)
+						// })
+							d1.style.whiteSpace = "pre"
+						d1.innerText = JSON.stringify({
+							items: await db.items.find(),
+							items2: await db.items2.find(),
+							items4a: await db.items4a.find(),
+						}, null, 2)
 
 					} catch(e) {
 						console.error(e)

package/tests/{config_test2 → manual_test}/index.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* Dashboard */
 const path_1 = __importDefault(require("path"));
 const express_1 = __importDefault(require("express"));
 const prostgles_server_1 = __importDefault(require("prostgles-server"));
@@ -11,7 +10,7 @@ process.on('unhandledRejection', (reason, p) => {
     console.trace('Unhandled Rejection at:', p, 'reason:', reason);
     process.exit(1);
 });
-const app = express_1.default();
+const app = (0, express_1.default)();
 app.use(express_1.default.json());
 app.use(express_1.default.urlencoded({ extended: true }));
 const _http = require("http");
@@ -19,19 +18,17 @@ const http = _http.createServer(app);
 const io = require("socket.io")(http, {
     path: "/s"
 });
-http.listen(process.env.NPORT || 30011);
-const log = (msg, extra) => {
-    console.log(...["(server): " + msg, extra].filter(v => v));
-};
-console.log(2);
-prostgles_server_1.default({
+const port = process.env.NPORT || 3004;
+console.log("App listening on port: ", port);
+http.listen(port);
+(0, prostgles_server_1.default)({
     dbConnection: {
         host: process.env.POSTGRES_HOST || "localhost",
         port: +process.env.POSTGRES_PORT || 5432,
         database: process.env.POSTGRES_DB || "postgres",
         user: process.env.POSTGRES_USER || "api",
         password: process.env.POSTGRES_PASSWORD || "api",
-        application_name: "hehe" + Date.now()
+        application_name: "manual_test" + Date.now()
     },
     io,
     tsGeneratedTypesDir: path_1.default.join(__dirname + '/'),
@@ -41,16 +38,25 @@ prostgles_server_1.default({
     sqlFilePath: path_1.default.join(__dirname + '/init.sql'),
     // transactions: true,	
     joins: "inferred",
-    publishRawSQL: async (socket, db, _db, user) => {
+    publishRawSQL: async (params) => {
         // log("set auth logic")
         return true;
     },
-    publish: async (socket, dbo, _db, user) => {
-        return {
-            various: "*",
-        };
+    publish: async (params) => {
+        return "*";
     },
-    onReady: async (db, _db) => {
+    onReady: async (db) => {
+        app.get('*', function (req, res) {
+            console.log(req.originalUrl);
+            res.sendFile(path_1.default.join(__dirname + '/index.html'));
+        });
+        const nestedRow = { name: "nested_insert" };
+        const parentRow = { name: "parent insert" };
+        // await db.items3.insert({ items_id: nestedRow, items2_id: nestedRow, ...parentRow });
+        console.log({
+            items: await db.items.find(),
+            items_multi: await db.items_multi.find(),
+        });
         // await _db.any("CREATE TABLE IF NOT EXISTS ttt(id INTEGER, t TEXT)");
         // console.log(await db.various.find({ "id.<": 1423 }) )
         // db.various.subscribe({ "id.<": 1423 }, {}, console.log)