prostgles-server 2.0.185 → 2.0.188

package/tests/{config_test2 → manual_test}/package.json

@@ -6,26 +6,25 @@
   "scripts": {
     "build": "npm i && tsc",
     "run": "npm run build && node index.js",
-    "start": "tsc-watch --onSuccess \"node index.js\""
+    "start": "tsc-watch --onSuccess \"node --inspect index.js\""
   },
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@types/express": "^4.17.11",
-    "@types/socket.io": "^2.1.13",
-    "@types/socket.io-client": "^1.4.35",
-    "@types/ws": "^7.4.0",
-    "chokidar": "^3.5.1",
+    "@types/express": "latest",
+    "@types/ws": "latest",
+    "chokidar": "latest",
     "express": "latest",
     "prostgles-client": "latest",
     "prostgles-server": "file:../..",
-    "prostgles-types": "^1.5.66",
+    "prostgles-types": "latest",
     "socket.io": "latest",
     "socket.io-client": "latest",
     "ws": "latest"
   },
   "devDependencies": {
     "@types/node": "latest",
+    "tsc-watch": "^5.0.3",
     "typescript": "latest"
   }
 }

package/tests/manual_test/tsconfig.json

@@ -0,0 +1,21 @@
+{
+	"files": ["./index.ts"],
+	"compilerOptions": {
+		"target": "es2020",
+		"lib": [ "es2020" ],
+		"esModuleInterop" : true,
+		"allowSyntheticDefaultImports": true,
+    "resolveJsonModule": true,
+		"allowJs": true,
+		"module": "commonjs",
+    "moduleResolution": "node",
+		"declaration": true,
+		"declarationMap": true,
+		"keyofStringsOnly": true,
+		"skipLibCheck": true
+	},
+	"exclude": [
+		"dist",
+		"DBoGenerated.ts"
+	]
+}

package/tests/server/DBoGenerated.d.ts

@@ -84,6 +84,19 @@ export type DBSchemaGenerated = {
       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;
@@ -96,6 +109,21 @@ export type DBSchemaGenerated = {
       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;
@@ -169,6 +197,19 @@ export type DBSchemaGenerated = {
       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;
@@ -179,6 +220,18 @@ export type DBSchemaGenerated = {
       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;
@@ -187,6 +240,8 @@ export type DBSchemaGenerated = {
     delete: true;
     columns: {
       content_type: string;
+      deleted?: number | null;
+      deleted_from_storage?: number | null;
       description?: string | null;
       etag?: string | null;
       extension: string;
@@ -296,6 +351,21 @@ export type DBSchemaGenerated = {
       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;

package/tests/server/index.js

@@ -9,6 +9,10 @@ const prostgles_server_1 = __importDefault(require("prostgles-server"));
 const app = (0, express_1.default)();
 const http = require('http').createServer(app);
 const { exec } = require('child_process');
+const publishTypeCheck_1 = require("./publishTypeCheck");
+const dboTypeCheck_1 = require("./dboTypeCheck");
+(0, dboTypeCheck_1.testDboTypes)();
+(0, publishTypeCheck_1.testPublishTypes)();
 const clientTest = (process.env.TEST_TYPE === "client");
 const io = !clientTest ? undefined : require("socket.io")(http, { path: "/teztz/s" });
 http.listen(3001);
@@ -201,6 +205,9 @@ function dd() {
                 items: "*",
                 items2: "*",
                 items3: "*",
+                items4a: "*",
+                // items_with_media_cols: "*",
+                items_multi: "*",
                 v_items: "*",
                 various: "*",
                 tr1: "*",
@@ -276,12 +283,32 @@ function dd() {
         joins: [
             {
                 tables: ["items", "items2"],
-                on: { name: "name" },
+                on: [{ name: "name" }],
                 type: "many-many"
             },
             {
                 tables: ["items2", "items3"],
-                on: { name: "name" },
+                on: [{ name: "name" }],
+                type: "many-many"
+            },
+            {
+                tables: ["items4a", "items"],
+                on: [{ items_id: "id" }],
+                type: "many-many"
+            },
+            {
+                tables: ["items4a", "items2"],
+                on: [{ items2_id: "id" }],
+                type: "many-many"
+            },
+            {
+                tables: ["items_multi", "items"],
+                on: [
+                    { items0_id: "id" },
+                    { items1_id: "id" },
+                    { items2_id: "id" },
+                    { items3_id: "id" },
+                ],
                 type: "many-many"
             }
         ],

package/tests/server/index.ts

@@ -7,7 +7,9 @@ const http = require('http').createServer(app);
 const { exec } = require('child_process');
 import { testPublishTypes } from "./publishTypeCheck";
 
-import { testDboTypes } from "./dboTypeCheck"
+import { testDboTypes } from "./dboTypeCheck";
+testDboTypes();
+testPublishTypes();
 
 const clientTest = (process.env.TEST_TYPE === "client");
 const io = !clientTest? undefined : require("socket.io")(http, { path: "/teztz/s" });
@@ -22,7 +24,6 @@ import { DBSchemaGenerated } from "./DBoGenerated";
 
 import { TableConfig } from '../../dist/TableConfig';
 import { DBOFullyTyped } from "../../lib/DBSchemaBuilder";
-import { ProstglesInitOptions } from "../../dist/Prostgles";
 import { PublishFullyTyped } from "../../dist/DBSchemaBuilder";
 
 const log = (msg: string, extra?: any, trace?: boolean) => {
@@ -231,6 +232,9 @@ function dd(){
 				items: "*",
 				items2: "*",
 				items3: "*",
+				items4a: "*",
+				// items_with_media_cols: "*",
+				items_multi: "*",
 				v_items: "*",
 				various: "*",
 				tr1: "*",
@@ -308,14 +312,36 @@ function dd(){
 		joins: [
 			{ 
 				tables: ["items", "items2"],
-				on: { name: "name" },
+				on: [{ name: "name" }],
 				type: "many-many"
 			},
 			{ 
 				tables: ["items2", "items3"],
-				on: { name: "name" },
+				on: [{ name: "name" }],
+				type: "many-many"
+			},
+			{ 
+				tables: ["items4a", "items"],
+				on: [{ items_id: "id" }],
+				type: "many-many"
+			},
+			{ 
+				tables: ["items4a", "items2"],
+				on: [{ items2_id: "id" }],
+				type: "many-many"
+			},
+			{ 
+				tables: ["items_multi", "items"],
+				on: [
+					{ items0_id: "id" },
+					{ items1_id: "id" },
+					{ items2_id: "id" },
+					{ items3_id: "id" },
+				],
 				type: "many-many"
 			}
+
+			
 		],
 		onReady: async (db, _db) => {
 			log("prostgles onReady")

package/tests/server/init.sql

@@ -40,6 +40,14 @@ CREATE TABLE IF NOT EXISTS items_with_media (
 	name	TEXT
 );
 
+-- DROP TABLE IF EXISTS items_with_media_cols CASCADE;
+-- CREATE TABLE IF NOT EXISTS items_with_media_cols (
+-- 	id		SERIAL PRIMARY KEY,
+-- 	"desc" TEXT,
+-- 	file_id UUID REFERENCES media(id)
+-- );
+
+
 DROP TABLE IF EXISTS various CASCADE;
 CREATE TABLE IF NOT EXISTS various (
 	id		SERIAL PRIMARY KEY,
@@ -73,6 +81,23 @@ CREATE TABLE IF NOT EXISTS items3 (
 	name	TEXT
 );
 
+DROP TABLE IF EXISTS items4a CASCADE;
+CREATE TABLE IF NOT EXISTS items4a (
+	id		SERIAL PRIMARY KEY,
+	items_id	INTEGER REFERENCES items(id),
+	items2_id	INTEGER REFERENCES items2(id),
+	name	TEXT
+);
+
+DROP TABLE IF EXISTS items_multi CASCADE;
+CREATE TABLE IF NOT EXISTS items_multi (
+	id		SERIAL PRIMARY KEY,
+	items0_id	INTEGER REFERENCES items(id),
+	items1_id	INTEGER REFERENCES items(id),
+	items2_id	INTEGER REFERENCES items(id),
+	items3_id	INTEGER REFERENCES items(id),
+	name	TEXT
+);
 
 DROP TABLE IF EXISTS items4 CASCADE;
 CREATE TABLE IF NOT EXISTS items4 (

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.184",
+      "version": "2.0.187",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.95.0",
@@ -29,7 +29,7 @@
         "bluebird": "^3.7.2",
         "file-type": "^16.5.3",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^1.5.158",
+        "prostgles-types": "^1.5.160",
         "sharp": "^0.30.5"
       },
       "devDependencies": {
@@ -37,7 +37,7 @@
         "@types/bluebird": "^3.5.36",
         "@types/node": "^14.14.35",
         "@types/sharp": "^0.30.2",
-        "typescript": "^4.7.3"
+        "typescript": "^4.7.4"
       }
     },
     "node_modules/@types/component-emitter": {
@@ -1371,9 +1371,9 @@
         "bluebird": "^3.7.2",
         "file-type": "^16.5.3",
         "pg-promise": "^10.11.1",
-        "prostgles-types": "^1.5.158",
+        "prostgles-types": "^1.5.160",
         "sharp": "^0.30.5",
-        "typescript": "^4.7.3"
+        "typescript": "^4.7.4"
       }
     },
     "proxy-addr": {

package/tests/config_test2/DBoGenerated.d.ts

@@ -1,135 +0,0 @@
-/* This file was generated by Prostgles 
-*/ 
-
- 
-
-import { ViewHandler, TableHandler, JoinMaker } from "prostgles-types";
-
-export type TxCB = {
-    (t: DBObj): (any | void | Promise<(any | void)>)
-};
-
-
-/* SCHEMA DEFINITON. Table names have been altered to work with Typescript */
-export type D_34_42_34 = { 
-  "id"?: number;
-  "\"*\""?: string;
-}
-export type D_42 = { 
-  "id"?: number;
-  "*"?: string;
-}
-export type Ex_j_ins = { 
-  "id"?: number;
-  "public"?: string;
-  "name"?: string;
-  "added"?: Date;
-}
-export type Item_children = { 
-  "id"?: number;
-  "item_id"?: number;
-  "name"?: string;
-  "tst"?: Date;
-}
-export type Items = { 
-  "id"?: number;
-  "name"?: string;
-  "tst"?: Date;
-}
-export type Items2 = { 
-  "id"?: number;
-  "items_id"?: number;
-  "hh"?: Array<string>;
-  "name"?: string;
-}
-export type Items3 = { 
-  "id"?: number;
-  "h"?: Array<string>;
-  "name"?: string;
-}
-export type Items4 = { 
-  "id"?: number;
-  "public"?: string;
-  "name"?: string;
-  "added"?: Date;
-}
-export type Items4_pub = { 
-  "id"?: number;
-  "public"?: string;
-  "name"?: string;
-  "added"?: Date;
-}
-export type Lookup_status = { 
-  "id"?: string;
-  "en"?: string;
-  "fr"?: string;
-}
-export type Planes = { 
-  "id"?: number;
-  "x"?: number;
-  "y"?: number;
-  "flight_number"?: string;
-  "last_updated"?: 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;
-}
-export type Usr = { 
-  "id"?: number;
-  "status"?: string;
-  "msg"?: string;
-  "added"?: Date;
-  "is_active"?: boolean;
-  "age"?: number;
-}
-export type Various = { 
-  "id"?: number;
-  "h"?: Array<string>;
-  "name"?: string;
-  "tsv"?: any;
-  "jsn"?: Object;
-  "added"?: Date;
-}
-
-export type JoinMakerTables = {
- "item_children": JoinMaker<Item_children>;
- "items": JoinMaker<Items>;
- "lookup_status": JoinMaker<Lookup_status>;
- "tr1": JoinMaker<Tr1>;
- "tr2": JoinMaker<Tr2>;
- "usr": JoinMaker<Usr>;
-};
-
-/* DBO Definition. Isomorphic */
-export type DBObj = {
-  "\"*\"": TableHandler<D_34_42_34> 
-  "*": TableHandler<D_42> 
-  "ex_j_ins": TableHandler<Ex_j_ins> 
-  "item_children": TableHandler<Item_children> 
-  "items": TableHandler<Items> 
-  "items2": TableHandler<Items2> 
-  "items3": TableHandler<Items3> 
-  "items4": TableHandler<Items4> 
-  "items4_pub": TableHandler<Items4_pub> 
-  "lookup_status": TableHandler<Lookup_status> 
-  "planes": TableHandler<Planes> 
-  "tr1": TableHandler<Tr1> 
-  "tr2": TableHandler<Tr2> 
-  "tt": TableHandler<Tt> 
-  "usr": TableHandler<Usr> 
-  "various": TableHandler<Various> 
-  leftJoin: JoinMakerTables;
-  innerJoin: JoinMakerTables;
-  leftJoinOne: JoinMakerTables;
-  innerJoinOne: JoinMakerTables;
-};

package/tests/config_test2/tsconfig.json

@@ -1,21 +0,0 @@
-{
-	"files": ["index.ts"],
-	"compilerOptions": {
-		// "outDir": "dist",
-		"target": "es2019",
-		"lib": [ "es2019" ],
-		"esModuleInterop" : true,
-		"allowSyntheticDefaultImports": true,
-		"allowJs": true,
-		"module": "commonjs",
-		// "sourceMap": true,
-		// "rootDir": ".",
-		// "declaration": true,
-		// "declarationMap": true,
-	},
-	"exclude": [
-		"dist",
-		"server",
-		"DBoGenerated.ts"
-	]
-}