prostgles-server 2.0.178 → 2.0.179

package/tests/server/index.ts

@@ -5,7 +5,9 @@ import prostgles from "prostgles-server";
 const app = express();
 const http = require('http').createServer(app);
 const { exec } = require('child_process');
+import { testPublishTypes } from "./publishTypeCheck";
 
+import { testDboTypes } from "./dboTypeCheck"
 
 const clientTest = (process.env.TEST_TYPE === "client");
 const io = !clientTest? undefined : require("socket.io")(http, { path: "/teztz/s" });
@@ -15,10 +17,13 @@ http.listen(3001);
 import isomorphic from "../isomorphic_queries";
 import server_only_queries from "../server_only_queries";
 
-import { DBObj, DBSchema } from "./DBoGenerated";
+import { DBSchemaGenerated } from "./DBoGenerated";
 // type DBObj = any;
 
 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) => {
 	const msgs = ["(server): " + msg, extra].filter(v => v);
@@ -59,6 +64,14 @@ const dbConnection = {
 	// password:  "usr",
 };
 
+function dd(){
+	
+	const dbo: DBOFullyTyped<{ tbl: { is_view: true; columns: { col1: { type: number } } }}> = 1 as any
+	if(!dbo) return;
+	dbo.tbl.find
+
+}
+
 (async () => {
 
 
@@ -96,8 +109,9 @@ const dbConnection = {
 				}
 			}
 		}
-	}
-	let prgl = await prostgles<DBSchema>({
+	} 
+	// ProstglesInitOptions<DBSchemaGenerated>
+	let prgl = await prostgles<DBSchemaGenerated>({
 		dbConnection,
 		sqlFilePath: path.join(__dirname+'/init.sql'),
 		io,
@@ -127,7 +141,9 @@ const dbConnection = {
 
 		onSocketDisconnect:  (socket, db) => {
 			log("onSocketDisconnect")
-			console.trace("onSocketDisconnect")
+			console.trace("onSocketDisconnect");
+			// const c: DBOFullyTyped<DBSchemaGenerated> = 1 as any;
+			// c["*"].
 		},
 		
 		onSocketConnect:  (socket, db) => {
@@ -210,7 +226,7 @@ const dbConnection = {
 			}
 		},
 		publish: async ({ user }) => {
-			return  {
+			const res: PublishFullyTyped<DBSchemaGenerated> =  {
 				shapes: "*",
 				items: "*",
 				items2: "*",
@@ -286,16 +302,7 @@ const dbConnection = {
 				}
 			};
 			
-			// return {
-			// 	items: {
-			// 		select: {
-			// 			fields: "*",
-			// 			forcedFilter: {
-			// 				$exists: { items3: { name: "a" } }
-			// 			}
-			// 		}
-			// 	}
-			// };
+			return res;
 		},
 		// joins: "inferred",
 		joins: [
@@ -388,4 +395,4 @@ async function tout(millis){
 			re(true);
 		}, millis)
 	})
-}
+}

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "2.0.177",
+      "version": "2.0.178",
       "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.153",
+        "prostgles-types": "^1.5.155",
         "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.2"
+        "typescript": "^4.7.3"
       }
     },
     "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.153",
+        "prostgles-types": "^1.5.155",
         "sharp": "^0.30.5",
-        "typescript": "^4.7.2"
+        "typescript": "^4.7.3"
       }
     },
     "proxy-addr": {

package/tests/server/publishTypeCheck.d.ts

@@ -0,0 +1,2 @@
+export declare const testPublishTypes: () => void;
+//# sourceMappingURL=publishTypeCheck.d.ts.map

package/tests/server/publishTypeCheck.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"publishTypeCheck.d.ts","sourceRoot":"","sources":["publishTypeCheck.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB,YA2H5B,CAAA"}

package/tests/server/publishTypeCheck.js

@@ -0,0 +1,120 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.testPublishTypes = void 0;
+const testPublishTypes = () => {
+    (() => {
+        const p1 = {
+            items: {
+                delete: "*",
+                select: {
+                    fields: { h: 1, id: 1 },
+                    forcedFilter: { h: { $overlaps: ["23", "32"] } }
+                }
+            },
+            items3: "*"
+        };
+        const p2 = "*";
+        const p11 = {
+            items: {
+                delete: "*",
+                select: {
+                    fields: { h: 1, id: 1 },
+                    forcedFilter: { h: { $overlaps: ["23", "32"] } }
+                }
+            },
+            items3: "*"
+        };
+        const p12 = "*";
+        const res = {
+            shapes: "*",
+            items: "*",
+            items2: "*",
+            items3: "*",
+            v_items: "*",
+            various: "*",
+            tr1: "*",
+            tr2: "*",
+            planes: {
+                select: "*",
+                update: "*",
+                insert: "*",
+                delete: "*",
+                sync: {
+                    id_fields: ["id"],
+                    synced_field: "last_updated"
+                }
+            },
+            items4: {
+                select: Math.random() ? "*" : {
+                    fields: { name: 0 },
+                    forcedFilter: { name: "abc" }
+                },
+                insert: "*",
+                update: "*",
+                delete: "*"
+            },
+            items4_pub: "*",
+            "*": {
+                select: { fields: { "*": 0 } },
+                insert: "*",
+                update: "*",
+            },
+            [`"*"`]: {
+                select: { fields: { [`"*"`]: 0 } },
+                insert: "*",
+                update: "*",
+            },
+            obj_table: "*",
+            media: "*",
+            items_with_one_media: "*",
+            items_with_media: "*",
+            prostgles_lookup_media_items_with_one_media: "*",
+            prostgles_lookup_media_items_with_media: "*",
+            insert_rules: {
+                insert: {
+                    fields: "*",
+                    returningFields: { name: 1 },
+                    validate: async (row) => {
+                        if (row.name === "a")
+                            row.name = "b";
+                        return row;
+                    }
+                }
+            },
+            uuid_text: {
+                insert: {
+                    fields: "*",
+                    forcedData: {
+                        id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'
+                    }
+                },
+                update: {
+                    fields: [],
+                    dynamicFields: [{
+                            fields: { id: 1 },
+                            filter: {
+                                id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'
+                            }
+                        }]
+                }
+            }
+        };
+        const res2 = res;
+        const res3 = {
+            items: {
+                select: {
+                    fields: {
+                        h: 1
+                    },
+                    forcedFilter: {
+                        // "h.$eq": ["2"]
+                        $and: [
+                            { "h.$eq": ["2"] }
+                        ]
+                    }
+                }
+            }
+        };
+    });
+};
+exports.testPublishTypes = testPublishTypes;

package/tests/server/publishTypeCheck.ts

@@ -0,0 +1,129 @@
+
+import { DBSchemaGenerated } from "./DBoGenerated";
+
+import { PublishFullyTyped } from "../../dist/DBSchemaBuilder";
+import { FullFilter } from "prostgles-types";
+export const testPublishTypes = () => {
+  (() => {
+    const p1: PublishFullyTyped<DBSchemaGenerated> = {
+      items: {
+        delete: "*",
+        select: {
+          fields: { h: 1, id: 1 },
+          forcedFilter: { h: { $overlaps: ["23", "32"]} }
+        }
+      },
+      items3: "*"
+    }
+    const p2: PublishFullyTyped<DBSchemaGenerated> = "*"
+
+    const p11: PublishFullyTyped = {
+      items: {
+        delete: "*",
+        select: {
+          fields: { h: 1, id: 1 },
+          forcedFilter: { h: { $overlaps: ["23", "32"]} }
+        }
+      },
+      items3: "*"
+    };
+
+    const p12: PublishFullyTyped = "*";
+
+
+
+    const res: PublishFullyTyped =  {
+      shapes: "*",
+      items: "*",
+      items2: "*",
+      items3: "*",
+      v_items: "*",
+      various: "*",
+      tr1: "*",
+      tr2: "*",
+      planes: {
+        select: "*",
+        update: "*",
+        insert: "*",
+        delete: "*",
+        sync: {
+          id_fields: ["id"],
+          synced_field: "last_updated"
+        }
+      },
+
+      items4: {
+        select: Math.random()? "*" : {
+          fields: { name: 0 },
+          forcedFilter: { name: "abc" }
+        },
+        insert: "*",
+        update: "*",
+        delete: "*"
+      },
+
+      items4_pub: "*",
+      "*": {
+        select: { fields: { "*": 0 }},
+        insert: "*",
+        update: "*",
+      },
+      [`"*"`]: {
+        select: { fields: { [`"*"`]: 0 }},
+        insert: "*",
+        update: "*",
+      },
+      obj_table: "*",
+      media: "*",
+      items_with_one_media: "*",
+      items_with_media: "*",
+      prostgles_lookup_media_items_with_one_media: "*",
+      prostgles_lookup_media_items_with_media: "*",
+      insert_rules: {
+        insert: {
+          fields: "*",
+          returningFields: { name: 1 },
+          validate: async (row) => {
+            if(row.name === "a") row.name = "b"
+            return row
+          }
+        }
+      },
+      uuid_text: {
+        insert: {
+          fields: "*",
+          forcedData: {
+            id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'
+          }
+        },
+        update: {
+          fields: [],
+          dynamicFields: [{
+            fields: { id: 1 },
+            filter: {
+              id: 'c81089e1-c4c1-45d7-a73d-e2d613cb7c3e'
+            }
+          }]
+        }
+      }
+    };
+
+    const res2: PublishFullyTyped<DBSchemaGenerated> = res; 
+    const res3: PublishFullyTyped<DBSchemaGenerated> = {
+      items: {
+        select: {
+          fields: {
+            h: 1
+          },
+          forcedFilter: {
+            // "h.$eq": ["2"]
+            $and: [
+              { "h.$eq": ["2"] }
+            ]
+          }
+        }
+      }
+    }; 
+
+  })
+}

package/tests/server/tsconfig.json

@@ -1,17 +1,16 @@
 {
 	"files": ["./index.ts"],
 	"compilerOptions": {
-		// "outDir": "dist",
 		"target": "es2020",
 		"lib": [ "es2020" ],
 		"esModuleInterop" : true,
 		"allowSyntheticDefaultImports": true,
+    "resolveJsonModule": true,
 		"allowJs": true,
 		"module": "commonjs",
-		// "sourceMap": true,
-		// "rootDir": ".",
-		// "declaration": true,
-		// "declarationMap": true,
+    "moduleResolution": "node",
+		"declaration": true,
+		"declarationMap": true,
 		"keyofStringsOnly": true
 	},
 	"exclude": [

package/tests/server_only_queries.d.ts

@@ -0,0 +1,2 @@
+export default function f(db: any): Promise<void>;
+//# sourceMappingURL=server_only_queries.d.ts.map

package/tests/server_only_queries.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server_only_queries.d.ts","sourceRoot":"","sources":["server_only_queries.ts"],"names":[],"mappings":"AAAA,wBAA8B,CAAC,CAAC,EAAE,EAAE,GAAG,iBActC"}