prostgles-server 4.2.180 → 4.2.181

package/lib/initProstgles.ts

@@ -99,9 +99,9 @@ export const initProstgles = async function (
     }
 
     const conObj =
-      typeof this.opts.dbConnection === "string"
-        ? { connectionString: this.opts.dbConnection }
-        : this.opts.dbConnection;
+      typeof this.opts.dbConnection === "string" ?
+        { connectionString: this.opts.dbConnection }
+      : this.opts.dbConnection;
     const application_name = `prostgles ${this.appId} ${existingAppName}`;
 
     /* 1. Connect to db */
@@ -262,64 +262,63 @@ export const initProstgles = async function (
 
 type GetDbConnectionArgs = Pick<
   ProstglesInitOptions,
-  "DEBUG_MODE" | "onQuery" | "dbConnection" | "dbOptions" | "onNotice"
+  "DEBUG_MODE" | "onQuery" | "dbConnection" | "onNotice"
 >;
 const getDbConnection = function ({
   dbConnection,
   onQuery,
   DEBUG_MODE,
-  dbOptions,
   onNotice,
 }: GetDbConnectionArgs): { db: DB; pgp: PGP } {
   const onQueryOrError:
     | undefined
     | ((error: any, ctx: pgPromise.IEventContext<pg.IClient>) => void) =
-    !onQuery && !DEBUG_MODE
-      ? undefined
-      : (error, ctx) => {
-          if (onQuery) {
-            onQuery(error, ctx);
-          } else if (DEBUG_MODE) {
-            if (error) {
-              console.error(error, ctx);
-            } else {
-              console.log(ctx);
-            }
+    !onQuery && !DEBUG_MODE ?
+      undefined
+    : (error, ctx) => {
+        if (onQuery) {
+          onQuery(error, ctx);
+        } else if (DEBUG_MODE) {
+          if (error) {
+            console.error(error, ctx);
+          } else {
+            console.log(ctx);
           }
-        };
+        }
+      };
 
   const pgp: PGP = pgPromise({
-    ...(onQueryOrError
-      ? {
-          query: (ctx) => onQueryOrError(undefined, ctx),
-          error: onQueryOrError,
-        }
-      : {}),
-    ...(onNotice || DEBUG_MODE
-      ? {
-          connect: function ({ client, useCount }) {
-            const isFresh = !useCount;
-            if (isFresh && !client.listeners("notice").length) {
-              client.on("notice", function (msg) {
-                if (onNotice) {
-                  onNotice(msg, msg?.message);
-                } else {
-                  console.log("notice: %j", msg?.message);
-                }
-              });
-            }
-            if (isFresh && !client.listeners("error").length) {
-              client.on("error", function (msg) {
-                if (onNotice) {
-                  onNotice(msg, msg?.message);
-                } else {
-                  console.log("error: %j", msg?.message);
-                }
-              });
-            }
-          },
-        }
-      : {}),
+    ...(onQueryOrError ?
+      {
+        query: (ctx) => onQueryOrError(undefined, ctx),
+        error: onQueryOrError,
+      }
+    : {}),
+    ...(onNotice || DEBUG_MODE ?
+      {
+        connect: function ({ client, useCount }) {
+          const isFresh = !useCount;
+          if (isFresh && !client.listeners("notice").length) {
+            client.on("notice", function (msg) {
+              if (onNotice) {
+                onNotice(msg, msg?.message);
+              } else {
+                console.log("notice: %j", msg?.message);
+              }
+            });
+          }
+          if (isFresh && !client.listeners("error").length) {
+            client.on("error", function (msg) {
+              if (onNotice) {
+                onNotice(msg, msg?.message);
+              } else {
+                console.log("error: %j", msg?.message);
+              }
+            });
+          }
+        },
+      }
+    : {}),
   });
   // pgp.pg.defaults.max = 70;
 
@@ -340,9 +339,9 @@ const getDbConnection = function ({
   pgp.pg.types.setTypeParser(pgp.pg.types.builtins.TIMESTAMPTZ, (v) => v); // timestamp with time zone
   pgp.pg.types.setTypeParser(pgp.pg.types.builtins.DATE, (v) => v); // date
 
-  if (dbOptions) {
-    Object.assign(pgp.pg.defaults, dbOptions);
-  }
+  // if (dbOptions) {
+  //   Object.assign(pgp.pg.defaults, dbOptions);
+  // }
 
   return {
     db: pgp(dbConnection),

package/lib/typeTests/DBoGenerated.d.ts

@@ -1,4 +1,4 @@
-export type DBSchemaGenerated = {
+export type DBGeneratedSchema = {
   items: {
     is_view: false;
     select: true;
@@ -188,20 +188,25 @@ export type DBSchemaGenerated = {
     update: true;
     delete: true;
     columns: {
-      colOneOf: "a" | "b" | "c"
-      json: {    a: boolean;   arr: '1' | '2' | '3';   arr1: 1 | 2 | 3;   arr2: number[];   arrStr?: null | string[];   o?: | null
- |  {  o1: number; }
- |  {  o2: boolean; };  };
-      jsonOneOf?: 
-       | null
-       |  {  command: 'a'; }
-       |  {  command: 'b';  option: number[]; }
-      status?: 
-       | null
-       |  {  ok: string; }
-       |  {  err: string; }
-       |  {  loading: {  loaded: number;  total: number; }; }
-      table_config?: null | {    referencedTables?: (  {  name: string;  minFiles: number; } )[];   recType?: null | Record<'a' | 'b',  {  bools: boolean[]; }>;  };
+      colOneOf: "a" | "b" | "c";
+      json: {
+        a: boolean;
+        arr: "1" | "2" | "3";
+        arr1: 1 | 2 | 3;
+        arr2: number[];
+        arrStr?: null | string[];
+        o?: null | { o1: number } | { o2: boolean };
+      };
+      jsonOneOf?: null | { command: "a" } | { command: "b"; option: number[] };
+      status?:
+        | null
+        | { ok: string }
+        | { err: string }
+        | { loading: { loaded: number; total: number } };
+      table_config?: null | {
+        referencedTables?: { name: string; minFiles: number }[];
+        recType?: null | Record<"a" | "b", { bools: boolean[] }>;
+      };
     };
   };
   tr1: {
@@ -261,8 +266,8 @@ export type DBSchemaGenerated = {
     columns: {
       email: string;
       id?: number;
-      preferences: {    showIntro?: boolean;   theme?: 'light' | 'dark' | 'auto';   others: any[];  };
-      status: "active" | "disabled" | "pending"
+      preferences: { showIntro?: boolean; theme?: "light" | "dark" | "auto"; others: any[] };
+      status: "active" | "disabled" | "pending";
     };
   };
   users_public_info: {
@@ -316,5 +321,4 @@ export type DBSchemaGenerated = {
       tsv?: null | string;
     };
   };
-  
-}
+};

package/lib/typeTests/dboTypeCheck.ts

@@ -2,7 +2,7 @@ import { ViewHandler } from "prostgles-types";
 import type { DBOFullyTyped } from "../DBSchemaBuilder";
 import type { DBHandlerServer } from "../DboBuilder/DboBuilder";
 import { Publish } from "../PublishParser/PublishParser";
-import { DBSchemaGenerated } from "./DBoGenerated";
+import { DBGeneratedSchema } from "./DBoGenerated";
 
 type DBSchema2 = {
   tr2: {
@@ -18,24 +18,27 @@ type DBSchema2 = {
       tr1_id?: null | number;
     };
   };
-}
-export const testDboTypes =  () => {
-  (async () => {
+};
+export const testDboTypes = () => {
+  async () => {
     const dbo = {} as DBOFullyTyped;
     dbo.someTable?.find;
 
     const dbo1 = {} as DBHandlerServer;
     dbo1.w?.find;
 
-    const db = {} as DBOFullyTyped<DBSchemaGenerated>;
+    const db = {} as DBOFullyTyped<DBGeneratedSchema>;
     db.items2.find;
 
-    const r = await db.items2.find({ }, { 
-      select: { id: 1 }, 
-      orderBy: { 
-        id: 1,
-      } 
-    });
+    const r = await db.items2.find(
+      {},
+      {
+        select: { id: 1 },
+        orderBy: {
+          id: 1,
+        },
+      }
+    );
 
     r[0]?.id;
 
@@ -43,39 +46,50 @@ export const testDboTypes =  () => {
     r[0]?.bad_col;
 
     const tr2 = {} as ViewHandler<DBSchema2["tr2"]["columns"], DBSchema2>;
-    tr2.find({}, {
-      select: { id: 1 },
-      orderBy: { tr1_id: 1 } 
-    });
+    tr2.find(
+      {},
+      {
+        select: { id: 1 },
+        orderBy: { tr1_id: 1 },
+      }
+    );
 
-    tr2.find({}, {
-      //@ts-expect-error
-      select: { bad_col: 1 } 
-    });
+    tr2.find(
+      {},
+      {
+        //@ts-expect-error
+        select: { bad_col: 1 },
+      }
+    );
 
-    tr2.find({}, {
-      //@ts-expect-error
-      orderBy: { bad_col: 1 } 
-    });
+    tr2.find(
+      {},
+      {
+        //@ts-expect-error
+        orderBy: { bad_col: 1 },
+      }
+    );
 
-    (await db.items2.find({}, { select: { items_id: 1 }, returnType: "values" })) satisfies (number | null)[];
-    
+    (await db.items2.find({}, { select: { items_id: 1 }, returnType: "values" })) satisfies (
+      | number
+      | null
+    )[];
 
-    const publish: Publish<DBSchemaGenerated> = {
+    const publish: Publish<DBGeneratedSchema> = {
       items: {
         insert: {
-          fields: { 
-            name: 1, 
+          fields: {
+            name: 1,
             //@ts-expect-error
-            bad_col: 1
+            bad_col: 1,
           },
           validate: async (row) => ({
             ...row,
-            h: [""]
-          })
-        }
-      }
+            h: [""],
+          }),
+        },
+      },
     };
     publish;
-  })
-}
+  };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.180",
+  "version": "4.2.181",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,7 +15,8 @@
     "test-only": "cd tests/ && ./test.sh",
     "test-quick": "cd tests/ && ./test.sh -quick",
     "test": "rm -rf ./node_modules/* && rm -rf ./dist/* && npm i && npm run lint && npm run test-only",
-    "pushpublish": "npm version patch --git-tag-version false && git push && npm publish"
+    "generate-docs": "rm -f ./documentation/*.md && cd documentation/utils && npm start",
+    "pushpublish": "npm run generate-docs && npm version patch --git-tag-version false && git push && npm publish"
   },
   "repository": {
     "type": "git",
@@ -54,7 +55,7 @@
     "pg": "^8.11.5",
     "pg-cursor": "^2.11.0",
     "pg-promise": "^11.9.1",
-    "prostgles-types": "^4.0.117"
+    "prostgles-types": "^4.0.119"
   },
   "devDependencies": {
     "@types/express": "^4.17.21",