prostgles-server 4.2.344 → 4.2.345

package/lib/DBSchemaBuilder.ts

@@ -1,279 +0,0 @@
-import {
-  AnyObject,
-  DbJoinMaker,
-  DBSchema,
-  getJSONBSchemaTSTypes,
-  isDefined,
-  isObject,
-  JSONB,
-  SQLHandler,
-  TableHandler,
-  ViewHandler,
-} from "prostgles-types";
-import prostgles from ".";
-import { AuthConfig } from "./Auth/AuthTypes";
-import { DboBuilder, escapeTSNames, postgresToTsType } from "./DboBuilder/DboBuilder";
-import {
-  PublishAllOrNothing,
-  PublishParams,
-  PublishTableRule,
-  PublishViewRule,
-  type PublishObject,
-} from "./PublishParser/PublishParser";
-import { DBHandlerServer, TableSchemaColumn, TX } from "./DboBuilder/DboBuilderTypes";
-
-export const getDBSchema = (dboBuilder: DboBuilder): string => {
-  const tables: string[] = [];
-
-  const getColTypeForDBSchema = (udt_name: TableSchemaColumn["udt_name"]): string => {
-    if (udt_name === "interval") {
-      const units = ["years", "months", "days", "hours", "minutes", "seconds", "milliseconds"];
-
-      return `{ ${units.map((u) => `${u}?: number;`).join(" ")} }`;
-    }
-
-    return postgresToTsType(udt_name);
-  };
-
-  /** Tables and columns are sorted to avoid infinite loops due to changing order */
-  dboBuilder.tablesOrViews
-    ?.slice(0)
-    .sort((a, b) => a.name.localeCompare(b.name))
-    .forEach((tov) => {
-      const cols = tov.columns.slice(0).sort((a, b) => a.name.localeCompare(b.name));
-      const getColType = (c: (typeof cols)[number]) => {
-        let type: string =
-          (c.is_nullable ? "null | " : "") + getColTypeForDBSchema(c.udt_name) + ";";
-        const colConf = dboBuilder.prostgles.tableConfigurator?.getColumnConfig(tov.name, c.name);
-        if (colConf) {
-          if (isObject(colConf) && (colConf.jsonbSchema || colConf.jsonbSchemaType)) {
-            const schema: JSONB.JSONBSchema = colConf.jsonbSchema || {
-              ...colConf,
-              type: colConf.jsonbSchemaType,
-            };
-
-            type = getJSONBSchemaTSTypes(
-              schema,
-              { nullable: colConf.nullable },
-              "      ",
-              dboBuilder.tablesOrViews ?? []
-            );
-          } else if (isObject(colConf)) {
-            const addEnumTypes = (enumVals: any[] | readonly any[], nullable: boolean) => {
-              const types = enumVals.map((t) => (typeof t === "number" ? t : JSON.stringify(t)));
-              if (nullable) {
-                types.unshift("null");
-              }
-              type = types.join(" | ");
-            };
-            if ("enum" in colConf) {
-              if (!colConf.enum) throw "colConf.enum missing";
-              addEnumTypes(colConf.enum, !!colConf.nullable);
-              /** When referencing a isLookupTable table we add the isLookupTable.values as enums */
-            } else if (("references" in colConf && colConf.references) || c.references?.length) {
-              const { tableConfigurator } = dboBuilder.prostgles;
-              const lookupTableConfig =
-                colConf.references ?
-                  tableConfigurator?.config[colConf.references.tableName]
-                : c.references
-                    ?.map((ref) => {
-                      const refTableConfig = tableConfigurator?.config[ref.ftable];
-                      if (refTableConfig && "isLookupTable" in refTableConfig) {
-                        return refTableConfig;
-                      }
-                    })
-                    .find(isDefined);
-              if (lookupTableConfig && "isLookupTable" in lookupTableConfig) {
-                const enumValus = Object.keys(lookupTableConfig.isLookupTable.values);
-                addEnumTypes(enumValus, !!colConf.nullable);
-              }
-            }
-          }
-        }
-        /**
-         * Columns that are nullable or have default values can be ommitted from an insert
-         * Non nullable columns with default values cannot containt null values in an insert so they must contain a valid value or be omitted
-         */
-        return `${escapeTSNames(c.name)}${c.is_nullable || c.has_default ? "?" : ""}: ${type}`;
-      };
-      tables.push(`${escapeTSNames(tov.name)}: {
-    is_view: ${tov.is_view};
-    select: ${tov.privileges.select};
-    insert: ${tov.privileges.insert};
-    update: ${tov.privileges.update};
-    delete: ${tov.privileges.delete};
-    columns: {${cols
-      .map(
-        (c) => `
-      ${getColType(c)}`
-      )
-      .join("")}
-    };
-  };\n  `);
-    });
-  return `
-export type DBGeneratedSchema = {
-  ${tables.join("")}
-}
-`;
-};
-
-export type ServerViewHandler<
-  T extends AnyObject = AnyObject,
-  Schema extends DBSchema | void = void,
-> = ViewHandler<T, Schema> & { is_view: true };
-export type ServerTableHandler<
-  T extends AnyObject = AnyObject,
-  Schema extends DBSchema | void = void,
-> = TableHandler<T, Schema> & { is_view: false };
-
-export type DBTableHandlersFromSchema<Schema = void> =
-  Schema extends DBSchema ?
-    {
-      [tov_name in keyof Schema]: Schema[tov_name]["is_view"] extends true ?
-        ServerViewHandler<Schema[tov_name]["columns"], Schema>
-      : ServerTableHandler<Schema[tov_name]["columns"], Schema>;
-    }
-  : Record<string, Partial<ServerTableHandler>>;
-
-export type DBHandlerServerExtra<
-  TH = Record<string, Partial<ServerTableHandler>>,
-  WithTransactions = true,
-> = {
-  sql: SQLHandler;
-} & Partial<DbJoinMaker> &
-  (WithTransactions extends true ? { tx: TX<TH> } : Record<string, never>);
-
-export type DBOFullyTyped<
-  Schema = void,
-  WithTransactions = true,
-> = DBTableHandlersFromSchema<Schema> &
-  DBHandlerServerExtra<DBTableHandlersFromSchema<Schema>, WithTransactions>;
-
-export type PublishFullyTyped<Schema = void> =
-  Schema extends DBSchema ?
-    {
-      [tov_name in keyof Partial<Schema>]:
-        | PublishAllOrNothing
-        | (Schema[tov_name]["is_view"] extends true ?
-            PublishViewRule<Schema[tov_name]["columns"], Schema>
-          : PublishTableRule<Schema[tov_name]["columns"], Schema>);
-    }
-  : PublishObject;
-
-/** Type checks */
-() => {
-  const ddb = {} as DBOFullyTyped;
-  ddb.dwad?.insert;
-  ddb.dwad?.delete;
-
-  const d = {} as DBOFullyTyped<undefined>;
-  d.dwad?.insert;
-  d.dwad?.delete;
-
-  const p = {} as PublishParams;
-  p.dbo.dwad?.insert;
-  ddb.dwad?.delete;
-
-  //@ts-ignore
-  void prostgles({
-    dbConnection: "",
-    publish: async (params) => {
-      const _rows = await params.dbo.dwadwa?.find?.({});
-
-      return "*" as const;
-    },
-    transactions: true,
-    onReady: ({ dbo }) => {
-      void dbo.tdwa?.find!();
-      void dbo.tx((t) => {
-        void t.dwa?.find!();
-      });
-    },
-  });
-
-  const _auth: AuthConfig = {
-    sidKeyName: "sid_token",
-    getUser: (sid, db, _db) => {
-      db.dwadaw?.find;
-      return {};
-    },
-  };
-
-  type S = {
-    tbl1: {
-      columns: {
-        col1: number | null;
-        col2: string;
-      };
-    };
-    tbl2: {
-      columns: {
-        col1: number | null;
-        col2: string;
-      };
-    };
-  };
-
-  /** Test the created schema */
-  const c = {} as S;
-  const _test: DBSchema = c;
-  const dbt = {} as DBOFullyTyped<S>;
-
-  void dbt.tx((t) => {
-    void t.tbl1.delete();
-  });
-
-  const db = {} as DBHandlerServer;
-  void db.tx!((t) => {
-    void t.wadwa?.find!();
-  });
-
-  const _publish = (): PublishFullyTyped<S> => {
-    const r = {
-      tbl1: {
-        select: {
-          fields: "*" as const,
-          forcedFilter: { col1: 32, col2: "" },
-        },
-        getColumns: true,
-        getInfo: true,
-        delete: {
-          filterFields: { col1: 1 },
-        },
-      },
-      tbl2: {
-        delete: {
-          filterFields: "*" as const,
-          forcedFilter: { col1: 2 },
-        },
-      },
-    };
-    const res: PublishFullyTyped<S> = {
-      tbl1: {
-        select: {
-          fields: "*",
-          forcedFilter: { col1: 32, col2: "" },
-        },
-        getColumns: true,
-        getInfo: true,
-        delete: {
-          filterFields: { col1: 1 },
-        },
-      },
-      tbl2: {
-        delete: {
-          filterFields: "*" as const,
-          forcedFilter: { col1: 2 },
-        },
-      },
-    };
-    const _res1: PublishFullyTyped = r;
-
-    const p = {} as PublishParams<undefined>;
-
-    void p.dbo.dwadaw?.find?.();
-
-    return res;
-  };
-};

package/lib/utils.ts

@@ -1,14 +0,0 @@
-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)) as T;
-};
-
-export const sleep = function (ms: number) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms);
-  });
-};