prostgles-server 4.2.160 → 4.2.161

package/lib/typeTests/DBoGenerated.d.ts

@@ -0,0 +1,320 @@
+export type DBSchemaGenerated = {
+  items: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      h?: null | string[];
+      id?: number;
+      name?: null | string;
+    };
+  };
+  items2: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      hh?: null | string[];
+      id?: number;
+      items_id?: null | number;
+      name?: null | string;
+    };
+  };
+  items3: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      h?: null | string[];
+      id?: number;
+      name?: null | string;
+    };
+  };
+  items4: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      added?: null | string;
+      id?: number;
+      name: string;
+      public?: null | string;
+    };
+  };
+  items4_pub: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      added?: null | string;
+      id?: number;
+      name: string;
+      public?: null | string;
+    };
+  };
+  items4a: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      items_id?: null | number;
+      items2_id?: null | number;
+      name?: null | string;
+    };
+  };
+  "prostgles_test.basic": {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      txt?: null | string;
+    };
+  };
+  "prostgles_test.basic1": {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      id_basic?: null | number;
+      txt?: null | string;
+    };
+  };
+  "prostgles_test.mv_basic1": {
+    is_view: true;
+    select: true;
+    insert: false;
+    update: false;
+    delete: false;
+    columns: {
+      id: number;
+      id_basic: number;
+      txt: string;
+    };
+  };
+  rec: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      parent_id?: null | number;
+      recf?: null | number;
+    };
+  };
+  rec_ref: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+    };
+  };
+  self_join: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      my_id?: null | number;
+      my_id1?: null | number;
+      name?: null | string;
+    };
+  };
+  shapes: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      geog?: null | string;
+      geom?: null | string;
+      id?: string;
+    };
+  };
+  spatial_ref_sys: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      auth_name?: null | string;
+      auth_srid?: null | number;
+      proj4text?: null | string;
+      srid: number;
+      srtext?: null | string;
+    };
+  };
+  symbols: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id: string;
+    };
+  };
+  tjson: {
+    is_view: false;
+    select: true;
+    insert: true;
+    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[]; }>;  };
+    };
+  };
+  tr1: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      t1?: null | string;
+    };
+  };
+  tr2: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      t1?: null | string;
+      t2?: null | string;
+      tr1_id?: null | number;
+    };
+  };
+  tr3: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      t2?: null | string;
+      tr2_id?: null | number;
+    };
+  };
+  trades: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      price: string;
+      symbol: string;
+    };
+  };
+  users: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      email: string;
+      id?: number;
+      preferences: {    showIntro?: boolean;   theme?: 'light' | 'dark' | 'auto';   others: any[];  };
+      status: "active" | "disabled" | "pending"
+    };
+  };
+  users_public_info: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      avatar?: null | string;
+      id?: number;
+      name?: null | string;
+      sid?: null | string;
+    };
+  };
+  uuid_text: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      col1?: null | string;
+      col2?: null | string;
+      id?: null | string;
+    };
+  };
+  v_items: {
+    is_view: true;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: null | number;
+      name?: null | string;
+    };
+  };
+  various: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      added?: null | string;
+      h?: null | string[];
+      id?: number;
+      jsn?: null | any;
+      name?: null | string;
+      tsv?: null | string;
+    };
+  };
+  
+}

package/lib/typeTests/dboTypeCheck.ts

@@ -0,0 +1,81 @@
+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";
+
+type DBSchema2 = {
+  tr2: {
+    is_view: false;
+    select: true;
+    insert: true;
+    update: true;
+    delete: true;
+    columns: {
+      id?: number;
+      t1?: null | string;
+      t2?: null | string;
+      tr1_id?: null | number;
+    };
+  };
+}
+export const testDboTypes =  () => {
+  (async () => {
+    const dbo = {} as DBOFullyTyped;
+    dbo.someTable?.find;
+
+    const dbo1 = {} as DBHandlerServer;
+    dbo1.w?.find;
+
+    const db = {} as DBOFullyTyped<DBSchemaGenerated>;
+    db.items2.find;
+
+    const r = await db.items2.find({ }, { 
+      select: { id: 1 }, 
+      orderBy: { 
+        id: 1,
+      } 
+    });
+
+    r[0]?.id;
+
+    //@ts-expect-error
+    r[0]?.bad_col;
+
+    const tr2 = {} as ViewHandler<DBSchema2["tr2"]["columns"], DBSchema2>;
+    tr2.find({}, {
+      select: { id: 1 },
+      orderBy: { tr1_id: 1 } 
+    });
+
+    tr2.find({}, {
+      //@ts-expect-error
+      select: { 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)[];
+    
+
+    const publish: Publish<DBSchemaGenerated> = {
+      items: {
+        insert: {
+          fields: { 
+            name: 1, 
+            //@ts-expect-error
+            bad_col: 1
+          },
+          validate: async (row) => ({
+            ...row,
+            h: [""]
+          })
+        }
+      }
+    };
+    publish;
+  })
+}

package/lib/utils.ts

@@ -0,0 +1,15 @@
+
+export { get } from "prostgles-types";
+export const clone = <T extends any[] | Record<string, any>>(obj: T): T => {
+  if(typeof structuredClone !== "undefined"){
+    return structuredClone(obj);
+  }
+  
+  return JSON.parse(JSON.stringify(obj));
+}
+
+export const sleep = function (ms: number) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+} 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.160",
+  "version": "4.2.161",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",