prostgles-server 2.0.178 → 2.0.181

package/lib/DboBuilder.ts

@@ -42,23 +42,23 @@ export type Media = {
     "etag"?: string;
 }
 
-export type TxHandler = TablesAndViewHandlers;
-export type TxCB<DBO extends TablesAndViewHandlers = TablesAndViewHandlers> = {
-    (t: DBO, _t: pgPromise.ITask<{}>): (any | void);
+export type TxCB = {
+    (t: TableHandlers, _t: pgPromise.ITask<{}>): (any | void);
 }
-export type TX<DBO extends TablesAndViewHandlers = TablesAndViewHandlers> = {
-    (t: TxCB<DBO>): Promise<(any | void)>;
+export type TX = {
+    (t: TxCB): Promise<(any | void)>;
 }
 
-type TablesAndViewHandlers = {
+type TableHandlers = {
     [key: string]: Partial<TableHandler>;
 }
-export type DBHandlerServer<DBO extends TablesAndViewHandlers = TablesAndViewHandlers>= 
-  TablesAndViewHandlers & 
+
+export type DBHandlerServer = 
+  TableHandlers & 
   DbJoinMaker & {
     sql?: SQLHandler
   } & {
-    tx?: TX<DBO>
+    tx?: TX
   }
 
 export const getUpdateFilter = (args: { filter?: AnyObject; forcedFilter?: AnyObject; $and_key: string }): AnyObject => {
@@ -79,7 +79,7 @@ import {
     Join, Prostgles, DB
 } from "./Prostgles";
 import { 
- TableRule, UpdateRule, SyncRule, PublishParser, ValidateRow, ValidateUpdateRow, PublishAllOrNothing, PublishParams 
+ TableRule, UpdateRule, SyncRule, PublishParser, ValidateRow, ValidateUpdateRow, PublishAllOrNothing, PublishParams, DeleteRule 
 } from "./PublishParser";
 import { PubSubManager, asValue, BasicCallback, pickKeys, omitKeys } from "./PubSubManager";
 
@@ -146,7 +146,7 @@ export type LocalParams = {
     testRule?: boolean;
     tableAlias?: string;
     // subOne?: boolean;
-    dbTX?: TxHandler;
+    dbTX?: TableHandlers;
 
     // localTX?: pgPromise.ITask<{}>;
     localDBTX?: DBHandlerServer;
@@ -482,14 +482,14 @@ export class ViewHandler {
     dboBuilder: DboBuilder;
 
     t?: pgPromise.ITask<{}>;
-    dbTX?: TxHandler;
+    dbTX?: TableHandlers;
 
     is_view: boolean = true;
     filterDef: string = "";
 
     // pubSubManager: PubSubManager;
     is_media: boolean = false;
-    constructor(db: DB, tableOrViewInfo: TableSchema, dboBuilder: DboBuilder, t?: pgPromise.ITask<{}>, dbTX?: TxHandler, joinPaths?: JoinPaths){
+    constructor(db: DB, tableOrViewInfo: TableSchema, dboBuilder: DboBuilder, t?: pgPromise.ITask<{}>, dbTX?: TableHandlers, joinPaths?: JoinPaths){
         if(!db || !tableOrViewInfo) throw "";
 
         this.db = db;
@@ -774,7 +774,7 @@ export class ViewHandler {
     async getColumns(
         lang?: string, 
         params?: { rule: "update", filter: AnyObject, data: AnyObject }, 
-        _param3?: never, 
+        _param3?: undefined, 
         tableRules?: TableRule, 
         localParams?: LocalParams
     ): Promise<ValidatedColumnInfo[]> {
@@ -997,7 +997,7 @@ export class ViewHandler {
 
     }
 
-    async find(filter?: Filter, selectParams?: SelectParams , param3_unused?: never, tableRules?: TableRule, localParams?: LocalParams): Promise<any[]>{
+    async find(filter?: Filter, selectParams?: SelectParams , param3_unused?: undefined, tableRules?: TableRule, localParams?: LocalParams): Promise<any[]>{
         try {
             filter = filter || {};
             const allowedReturnTypes: Array<SelectParams["returnType"]> = ["row", "value", "values"]
@@ -1068,7 +1068,7 @@ export class ViewHandler {
         }                             
     }
 
-    findOne(filter?: Filter, selectParams?: SelectParams, param3_unused?: never, table_rules?: TableRule, localParams?: LocalParams): Promise<any>{
+    findOne(filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<any>{
 
         try {
             const { select = "*", orderBy, offset = 0 } = selectParams || {};
@@ -1084,7 +1084,7 @@ export class ViewHandler {
         }
     }
 
-    async count(filter?: Filter, param2_unused?: never, param3_unused?: never, table_rules?: TableRule, localParams: any = {}): Promise<number>{
+    async count(filter?: Filter, param2_unused?: undefined, param3_unused?: undefined, table_rules?: TableRule, localParams: any = {}): Promise<number>{
         filter = filter || {};
         try {
             return await this.find(filter, { select: "", limit: 0 }, undefined, table_rules, localParams)
@@ -1100,7 +1100,7 @@ export class ViewHandler {
         } 
     }
 
-    async size(filter?: Filter, selectParams?: SelectParams, param3_unused?: never, table_rules?: TableRule, localParams: any = {}): Promise<string>{
+    async size(filter?: Filter, selectParams?: SelectParams, param3_unused?: undefined, table_rules?: TableRule, localParams: any = {}): Promise<string>{
         filter = filter || {};
         try {
             return await this.find(filter, { ...selectParams, limit: 2 }, undefined, table_rules, localParams)
@@ -1685,7 +1685,7 @@ export class ViewHandler {
             return (excludeOrder? "" : " ORDER BY ") + (_ob.map(({ key, asc, nulls, nullEmpty = false }) => {
 
                 /* Order by column index when possible to bypass name collision when ordering by a computed column. 
-                    (Postgres will sort by existing columns whenever possible) 
+                    (Postgres will sort by existing columns wheundefined possible) 
                 */
                 const orderType = asc? " ASC " : " DESC ";
                 const index = selectedAliases.indexOf(key) + 1;
@@ -1930,7 +1930,7 @@ export class TableHandler extends ViewHandler {
         batching: string[] | null
     }
     
-    constructor(db: DB, tableOrViewInfo: TableSchema, dboBuilder: DboBuilder, t?: pgPromise.ITask<{}>, dbTX?: TxHandler, joinPaths?: JoinPaths){
+    constructor(db: DB, tableOrViewInfo: TableSchema, dboBuilder: DboBuilder, t?: pgPromise.ITask<{}>, dbTX?: TableHandlers, joinPaths?: JoinPaths){
         super(db, tableOrViewInfo, dboBuilder, t, dbTX, joinPaths);
 
         this.remove = this.delete;
@@ -2305,7 +2305,7 @@ export class TableHandler extends ViewHandler {
     }
     
 
-    private async insertDataParse(data: (AnyObject | AnyObject[]), param2?: InsertParams, param3_unused?: never, tableRules?: TableRule, _localParams?: LocalParams): Promise<{
+    private async insertDataParse(data: (AnyObject | AnyObject[]), param2?: InsertParams, param3_unused?: undefined, tableRules?: TableRule, _localParams?: LocalParams): Promise<{
         data?: AnyObject | AnyObject[];
         insertResult?: AnyObject | AnyObject[];
     }>{
@@ -2551,7 +2551,7 @@ export class TableHandler extends ViewHandler {
         return res;
     }
 
-    async insert(rowOrRows: (AnyObject | AnyObject[]), param2?: InsertParams, param3_unused?: never, tableRules?: TableRule, _localParams?: LocalParams): Promise<any | any[] | boolean>{
+    async insert(rowOrRows: (AnyObject | AnyObject[]), param2?: InsertParams, param3_unused?: undefined, tableRules?: TableRule, _localParams?: LocalParams): Promise<any | any[] | boolean>{
         const localParams = _localParams || {};
         const {dbTX} = localParams
         try {
@@ -2703,7 +2703,7 @@ export class TableHandler extends ViewHandler {
         return "";
     }
     
-    async delete(filter?: Filter, params?: DeleteParams, param3_unused?: never, table_rules?: TableRule, localParams?: LocalParams): Promise<any> {    //{ socket, func, has_rules = false, socketDb } = {}
+    async delete(filter?: Filter, params?: DeleteParams, param3_unused?: undefined, table_rules?: TableRule, localParams?: LocalParams): Promise<any> {    //{ socket, func, has_rules = false, socketDb } = {}
         try {
             const { returning } = params || {};
             filter = filter || {};
@@ -2713,7 +2713,8 @@ export class TableHandler extends ViewHandler {
 
             let forcedFilter: AnyObject | undefined = {},
                 filterFields: FieldFilter | undefined = "*",
-                returningFields: FieldFilter | undefined = "*";
+                returningFields: FieldFilter | undefined = "*",
+                validate: DeleteRule["validate"];
 
             const { testRule = false, returnQuery = false } = localParams || {};
             if(table_rules){
@@ -2721,6 +2722,7 @@ export class TableHandler extends ViewHandler {
                 forcedFilter = table_rules.delete.forcedFilter;
                 filterFields = table_rules.delete.filterFields;
                 returningFields = table_rules.delete.returningFields;
+                validate = table_rules.delete.validate;
 
                 if(!returningFields) returningFields = get(table_rules, "select.fields");
                 if(!returningFields) returningFields = get(table_rules, "delete.filterFields");
@@ -2751,6 +2753,10 @@ export class TableHandler extends ViewHandler {
                 localParams, 
                 tableRule: table_rules
             }));
+            if(validate){
+                const _filter = getUpdateFilter({ filter, forcedFilter, $and_key: this.dboBuilder.prostgles.keywords.$and });
+                await validate(_filter);
+            }
 
             if(returning){
                 queryType = "any";
@@ -2769,7 +2775,7 @@ export class TableHandler extends ViewHandler {
         }
     };
    
-    remove(filter: Filter, params?: UpdateParams, param3_unused?: never, tableRules?: TableRule, localParams?: LocalParams){
+    remove(filter: Filter, params?: UpdateParams, param3_unused?: undefined, tableRules?: TableRule, localParams?: LocalParams){
         return this.delete(filter, params, param3_unused , tableRules, localParams);
     }
 
@@ -2799,7 +2805,7 @@ export class TableHandler extends ViewHandler {
     };
 
     /* External request. Cannot sync from server */
-    async sync(filter: Filter, params: SelectParams, param3_unused: never, table_rules: TableRule, localParams: LocalParams){
+    async sync(filter: Filter, params: SelectParams, param3_unused: undefined, table_rules: TableRule, localParams: LocalParams){
         if(!localParams) throw "Sync not allowed within the same server code";
         const { socket } = localParams;
         if(!socket) throw "INTERNAL ERROR: socket missing";
@@ -3340,7 +3346,7 @@ export class DboBuilder {
 
     getTX = (cb: TxCB) => {
         return this.db.tx((t) => {
-            let dbTX: TxHandler = {};
+            let dbTX: TableHandlers = {};
             this.tablesOrViews?.map(tov => {
                 if(tov.is_view){
 

package/lib/FileManager.d.ts

@@ -0,0 +1,168 @@
+/// <reference types="node" />
+import { S3 } from 'aws-sdk';
+import { DB, DBHandlerServer, Prostgles } from './Prostgles';
+export declare const asSQLIdentifier: (name: string, db: DB) => Promise<string>;
+export declare type ImageOptions = {
+    keepMetadata?: boolean;
+    compression?: 
+    /**
+     * Will resize image maintaing scale ratio
+     */
+    {
+        inside: {
+            width: number;
+            height: number;
+        };
+    } | {
+        contain: {
+            width: number;
+        } | {
+            height: number;
+        };
+    };
+};
+export declare type S3Config = {
+    region: string;
+    bucket: string;
+    accessKeyId: string;
+    secretAccessKey: string;
+};
+export declare type LocalConfig = {
+    /**
+     * example: path.join(__dirname+'/media')
+     * note that this location will be relative to the compiled file location
+     */
+    localFolderPath: string;
+};
+export declare type UploadItem = {
+    name: string;
+    content_type: string;
+    data: Buffer;
+};
+export declare type UploadedItem = {
+    /**
+     * Url that is passed to client
+     */
+    url: string;
+    etag: string;
+    /**
+     * S3 url of the resource
+     */
+    s3_url?: string;
+};
+export default class FileManager {
+    s3Client?: S3;
+    config: S3Config | LocalConfig;
+    imageOptions?: ImageOptions;
+    prostgles?: Prostgles;
+    get dbo(): DBHandlerServer;
+    get db(): DB;
+    tableName?: string;
+    private fileRoute?;
+    constructor(config: FileManager["config"], imageOptions?: ImageOptions);
+    getMIME(file: Buffer | String, fileName: string, allowedExtensions?: Array<ALLOWED_EXTENSION>, dissallowedExtensions?: Array<ALLOWED_EXTENSION>, onlyFromName?: boolean): Promise<{
+        mime: string;
+        ext: string | ALLOWED_EXTENSION;
+        fileName: string;
+    }>;
+    private upload;
+    uploadAsMedia: (params: {
+        item: UploadItem;
+        allowedExtensions?: Array<ALLOWED_EXTENSION>;
+        dissallowedExtensions?: Array<ALLOWED_EXTENSION>;
+        imageOptions?: ImageOptions;
+    }) => Promise<UploadedItem>;
+    private getFileURL;
+    private parseSQLIdentifier;
+    init: (prg: Prostgles) => Promise<void>;
+}
+declare const CONTENT_TYPE_TO_EXT: {
+    readonly "text/html": readonly ["html", "htm", "shtml"];
+    readonly "text/css": readonly ["css"];
+    readonly "text/xml": readonly ["xml"];
+    readonly "text/mathml": readonly ["mml"];
+    readonly "text/plain": readonly ["txt"];
+    readonly "text/vnd.sun.j2me.app-descriptor": readonly ["jad"];
+    readonly "text/vnd.wap.wml": readonly ["wml"];
+    readonly "text/x-component": readonly ["htc"];
+    readonly "image/gif": readonly ["gif"];
+    readonly "image/jpeg": readonly ["jpeg", "jpg"];
+    readonly "image/png": readonly ["png"];
+    readonly "image/tiff": readonly ["tif", "tiff"];
+    readonly "image/vnd.wap.wbmp": readonly ["wbmp"];
+    readonly "image/x-icon": readonly ["ico"];
+    readonly "image/x-jng": readonly ["jng"];
+    readonly "image/x-ms-bmp": readonly ["bmp"];
+    readonly "image/svg+xml": readonly ["svg"];
+    readonly "image/webp": readonly ["webp"];
+    readonly "application/x-javascript": readonly ["js"];
+    readonly "application/atom+xml": readonly ["atom"];
+    readonly "application/rss+xml": readonly ["rss"];
+    readonly "application/java-archive": readonly ["jar", "war", "ear"];
+    readonly "application/mac-binhex40": readonly ["hqx"];
+    readonly "application/msword": readonly ["doc", "docx"];
+    readonly "application/pdf": readonly ["pdf"];
+    readonly "application/postscript": readonly ["ps", "eps", "ai"];
+    readonly "application/rtf": readonly ["rtf"];
+    readonly "application/vnd.ms-excel": readonly ["xls", "xlsx"];
+    readonly "application/vnd.ms-powerpoint": readonly ["ppt", "pptx"];
+    readonly "application/vnd.wap.wmlc": readonly ["wmlc"];
+    readonly "application/vnd.google-earth.kml+xml": readonly ["kml"];
+    readonly "application/vnd.google-earth.kmz": readonly ["kmz"];
+    readonly "application/x-7z-compressed": readonly ["7z"];
+    readonly "application/x-cocoa": readonly ["cco"];
+    readonly "application/x-java-archive-diff": readonly ["jardiff"];
+    readonly "application/x-java-jnlp-file": readonly ["jnlp"];
+    readonly "application/x-makeself": readonly ["run"];
+    readonly "application/x-perl": readonly ["pl", "pm"];
+    readonly "application/x-pilot": readonly ["prc", "pdb"];
+    readonly "application/x-rar-compressed": readonly ["rar"];
+    readonly "application/x-redhat-package-manager": readonly ["rpm"];
+    readonly "application/x-sea": readonly ["sea"];
+    readonly "application/x-shockwave-flash": readonly ["swf"];
+    readonly "application/x-stuffit": readonly ["sit"];
+    readonly "application/x-tcl": readonly ["tcl", "tk"];
+    readonly "application/x-x509-ca-cert": readonly ["der", "pem", "crt"];
+    readonly "application/x-xpinstall": readonly ["xpi"];
+    readonly "application/xhtml+xml": readonly ["xhtml"];
+    readonly "application/zip": readonly ["zip"];
+    readonly "application/octet-stream": readonly ["bin", "exe", "dll", "deb", "dmg", "eot", "iso", "img", "msi", "msp", "msm"];
+    readonly "audio/midi": readonly ["mid", "midi", "kar"];
+    readonly "audio/mpeg": readonly ["mp3"];
+    readonly "audio/ogg": readonly ["ogg"];
+    readonly "audio/x-realaudio": readonly ["ra"];
+    readonly "video/3gpp": readonly ["3gpp", "3gp"];
+    readonly "video/mpeg": readonly ["mpeg", "mpg"];
+    readonly "video/quicktime": readonly ["mov"];
+    readonly "video/x-flv": readonly ["flv"];
+    readonly "video/x-mng": readonly ["mng"];
+    readonly "video/x-ms-asf": readonly ["asx", "asf"];
+    readonly "video/x-ms-wmv": readonly ["wmv"];
+    readonly "video/x-msvideo": readonly ["avi"];
+    readonly "video/mp4": readonly ["m4v", "mp4"];
+    readonly "video/webm": readonly ["webm"];
+};
+export declare type ALLOWED_CONTENT_TYPE = keyof typeof CONTENT_TYPE_TO_EXT;
+export declare type ALLOWED_EXTENSION = (typeof CONTENT_TYPE_TO_EXT)[ALLOWED_CONTENT_TYPE][number];
+export {};
+/**
+ *
+ 
+
+    // if(content_type && typeof content_type !== "string") throw "Invalid content_type provided";
+    // if(title && typeof title !== "string") throw "Invalid title provided";
+    // let fExt = name.split(".").pop()
+    // if(content_type && name.split(".").length > 1 && fExt && fExt.length <= 4){
+    //   type = {
+    //     mime: content_type,
+    //     ext: fExt,
+    //     fileName: name,
+    //   }
+    // } else {
+    //   type = await this.getMIME(data, name);//, ["png", "jpg", "ogg", "webm", "pdf", "doc"]);
+    // }
+
+
+
+ */ 
+//# sourceMappingURL=FileManager.d.ts.map

package/lib/FileManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FileManager.d.ts","sourceRoot":"","sources":["FileManager.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAO7B,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAM7D,eAAO,MAAM,eAAe,SAAgB,MAAM,aAAW,QAAQ,MAAM,CAE1E,CAAA;AAED,oBAAY,YAAY,GAAG;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC;IACV;;OAEG;IACD;QAAE,MAAM,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,GAC7C;QAAE,OAAO,EACL;YAAE,KAAK,EAAE,MAAM,CAAA;SAAE,GACjB;YAAE,MAAM,EAAE,MAAM,CAAA;SAAE,CAAA;KACrB,CAAA;CACN,CAAA;AAED,oBAAY,QAAQ,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CAEzB,CAAA;AAED,oBAAY,WAAW,GAAG;IACxB;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB,CAAA;AAED,oBAAY,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AACF,oBAAY,YAAY,GAAG;IACzB;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAW;IAE9B,QAAQ,CAAC,EAAE,EAAE,CAAC;IAEd,MAAM,EAAE,QAAQ,GAAG,WAAW,CAAC;IAC/B,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,GAAG,IAAI,eAAe,CAGzB;IACD,IAAI,EAAE,IAAI,EAAE,CAGX;IAED,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,OAAO,CAAC,SAAS,CAAC,CAAS;gBAEf,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,EAAE,YAAY;IAahE,OAAO,CACX,IAAI,EAAE,MAAM,GAAG,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,EAC5C,qBAAqB,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,EAChD,YAAY,UAAO,GAClB,OAAO,CAAC;QACT,IAAI,EAAE,MAAM,CAAC;QACb,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC;QAChC,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;YAkFY,MAAM;IAiEpB,aAAa,WAAkB;QAC7B,IAAI,EAAE,UAAU,CAAC;QACjB,iBAAiB,CAAC,EAAE,MAAM,iBAAiB,CAAC,CAAC;QAC7C,qBAAqB,CAAC,EAAE,MAAM,iBAAiB,CAAC,CAAC;QACjD,YAAY,CAAC,EAAE,YAAY,CAAC;KAC7B,KAAG,QAAQ,YAAY,CAAC,CA6CxB;YAEa,UAAU;IASxB,OAAO,CAAC,kBAAkB,CAAuE;IAEjG,IAAI,QAAe,SAAS,mBAwK3B;CACF;AAED,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiEf,CAAC;AAEX,oBAAY,oBAAoB,GAAG,MAAM,OAAO,mBAAmB,CAAC;AACpE,oBAAY,iBAAiB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;;AAI3F;;;;;;;;;;;;;;;;;;;GAmBG"}