pwi-plata-type 0.4.201 → 0.4.202

package/src/@types/router.d.ts

@@ -1,108 +1,108 @@
-/// <reference types="express" />
-
-import express from 'express'
-
-declare global {
-    namespace Router {
-        type ListRouteParams<TRoute extends string> =
-            TRoute extends `/${infer TPart}/${infer TNextRoute}` ?
-                TPart extends `:${infer TParam}?` ? `${TParam}_O` | ListRouteParams<`/${TNextRoute}`>
-                : TPart extends `:${infer TParam}` ? `${TParam}_R` | ListRouteParams<`/${TNextRoute}`>
-                : undefined | ListRouteParams<`/${TNextRoute}`>
-            : TRoute extends `/${infer TPart}` ?
-                TPart extends `:${infer TParam}?` ? `${TParam}_O`
-                : TPart extends `:${infer TParam}` ? `${TParam}_R`
-                : undefined
-            : undefined
-        ;   
-
-        type GetRouteParams<TRoute extends string> = Exclude<ListRouteParams<TRoute>, undefined>
-
-        type GetUrlParams<TRoute extends string, TParams extends string = GetRouteParams<TRoute>> = {
-            [K in LooseAutocomplete<TParams> as K extends `${infer N}_${string}` ? N : string]: K extends `${string}_O` ? string | undefined : string
-        }
-
-        type expressRequest = Omit<express.Request, 'params'>
-
-        interface Request<T extends string = string> extends expressRequest {
-            user: any
-            extras: any
-            _onResponseEvent: PlataOnResponseEvent[]
-            params: GetUrlParams<T>
-        }
-
-        interface Response extends express.Response {
-            oldJson(body?: any): this
-            error(error: PlataError | PlataError[]): this
-            addOnResponseEvent<T = any>(callback: PlataOnResponseEvent<T>): void
-        }
-
-        type RequestHandler<T extends string = string> = (req: Request<T>, res: Response, next: express.NextFunction) => Promise<any>
-
-        type HttpPlataMethods =
-            "all"
-            | "get"
-            | "post"
-            | "put"
-            | "delete"
-            | "patch"
-            | "options"
-            | "head"
-            | "checkout"
-            | "connect"
-            | "copy"
-            | "lock"
-            | "merge"
-            | "mkactivity"
-            | "mkcol"
-            | "move"
-            | "notify"
-            | "propfind"
-            | "proppatch"
-            | "purge"
-            | "report"
-            | "search"
-            | "subscribe"
-            | "trace"
-            | "unlock"
-            | "unsubscribe"
-            | "use"
-        ;
-
-        interface CustomHttpMethods {}
-
-        type HttpMethods = 
-            HttpPlataMethods
-            | keyof CustomHttpMethods
-        ;
-
-        interface Route {
-            path?: string
-            method: string
-            handlers: RequestHandler[],
-            swaggerHide?: boolean | undefined
-        }
-
-        type RouterConfig<T extends Record<string, unknown> = Record<string, unknown>> = {
-            swaggerHide?: boolean
-            routes: Route[]
-            httpRoute: string
-            mark: T
-        }
-
-        type Router = RouterConfig & {
-            [method in HttpMethods]: 
-                method extends keyof CustomHttpMethods ?
-                CustomHttpMethods[method]
-                : <T extends string>(path: T | RequestHandler, ...handlers: RequestHandler<T>[]) => void | Promise<void>
-        }
-
-        type RouterBuilder = (r: Router) => Promise<Router>
-
-        export interface RequiredRoute extends RequiredInterface<RouterBuilder> {
-            httpRoute: string
-        }
-
-        type PlataOnResponseEvent<T = any> = (aReq: Request, aRes?: Response, body?: T, error?: PlataError | PlataError[]) => Promise<any>
-    }
+/// <reference types="express" />
+
+import express from 'express'
+
+declare global {
+    namespace Router {
+        type ListRouteParams<TRoute extends string> =
+            TRoute extends `/${infer TPart}/${infer TNextRoute}` ?
+                TPart extends `:${infer TParam}?` ? `${TParam}_O` | ListRouteParams<`/${TNextRoute}`>
+                : TPart extends `:${infer TParam}` ? `${TParam}_R` | ListRouteParams<`/${TNextRoute}`>
+                : undefined | ListRouteParams<`/${TNextRoute}`>
+            : TRoute extends `/${infer TPart}` ?
+                TPart extends `:${infer TParam}?` ? `${TParam}_O`
+                : TPart extends `:${infer TParam}` ? `${TParam}_R`
+                : undefined
+            : undefined
+        ;   
+
+        type GetRouteParams<TRoute extends string> = Exclude<ListRouteParams<TRoute>, undefined>
+
+        type GetUrlParams<TRoute extends string, TParams extends string = GetRouteParams<TRoute>> = {
+            [K in LooseAutocomplete<TParams> as K extends `${infer N}_${string}` ? N : string]: K extends `${string}_O` ? string | undefined : string
+        }
+
+        type expressRequest = Omit<express.Request, 'params'>
+
+        interface Request<T extends string = string> extends expressRequest {
+            user: any
+            extras: any
+            _onResponseEvent: PlataOnResponseEvent[]
+            params: GetUrlParams<T>
+        }
+
+        interface Response extends express.Response {
+            oldJson(body?: any): this
+            error(error: PlataError | PlataError[]): this
+            addOnResponseEvent<T = any>(callback: PlataOnResponseEvent<T>): void
+        }
+
+        type RequestHandler<T extends string = string> = (req: Request<T>, res: Response, next: express.NextFunction) => Promise<any>
+
+        type HttpPlataMethods =
+            "all"
+            | "get"
+            | "post"
+            | "put"
+            | "delete"
+            | "patch"
+            | "options"
+            | "head"
+            | "checkout"
+            | "connect"
+            | "copy"
+            | "lock"
+            | "merge"
+            | "mkactivity"
+            | "mkcol"
+            | "move"
+            | "notify"
+            | "propfind"
+            | "proppatch"
+            | "purge"
+            | "report"
+            | "search"
+            | "subscribe"
+            | "trace"
+            | "unlock"
+            | "unsubscribe"
+            | "use"
+        ;
+
+        interface CustomHttpMethods {}
+
+        type HttpMethods = 
+            HttpPlataMethods
+            | keyof CustomHttpMethods
+        ;
+
+        interface Route {
+            path?: string
+            method: string
+            handlers: RequestHandler[],
+            swaggerHide?: boolean | undefined
+        }
+
+        type RouterConfig<T extends Record<string, unknown> = Record<string, unknown>> = {
+            swaggerHide?: boolean
+            routes: Route[]
+            httpRoute: string
+            mark: T
+        }
+
+        type Router = RouterConfig & {
+            [method in HttpMethods]: 
+                method extends keyof CustomHttpMethods ?
+                CustomHttpMethods[method]
+                : <T extends string>(path: T | RequestHandler, ...handlers: RequestHandler<T>[]) => void | Promise<void>
+        }
+
+        type RouterBuilder = (r: Router) => Promise<Router>
+
+        export interface RequiredRoute extends RequiredInterface<RouterBuilder> {
+            httpRoute: string
+        }
+
+        type PlataOnResponseEvent<T = any> = (aReq: Request, aRes?: Response, body?: T, error?: PlataError | PlataError[]) => Promise<any>
+    }
 }

package/src/@types/sql.d.ts

@@ -1,121 +1,121 @@
-import { Knex } from 'knex'
-import moment from 'moment'
-
-import "@total-typescript/ts-reset/dist/filter-boolean"
-import { ModelTemplate } from '++/libs/models'
-import { PlataSql } from '..'
-
-
-declare global {
-    namespace Sql {
-
-        type SqlRawSelectColTypes =
-            | 'number'
-            | 'date'
-            | 'string'
-        ; 
-
-        type SqlRawSelectCamp<T> = 
-            [col: (s: Knex.QueryBuilder<T, any>) => Knex.QueryBuilder<T, any>, type: SqlRawSelectColTypes, required?: 'required' ]
-        ;
-
-        type SqlRawSelectColTypesValues<V extends SqlRawSelectColTypes> = 
-            V extends 'number' ? number
-            : V extends 'date' ? Date
-            : V extends 'string' ? string
-            : never
-        ;
-
-        type isRequired<I> = 
-            I extends 'required' ? undefined
-            : null
-        ;
-
-        interface SqlRawSelectInfo<T> {
-            table: string
-            cols: Record<string, SqlRawSelectCamp<T>>
-            query: (s: Knex.QueryBuilder<T, any>, t: T) => Knex.QueryBuilder<any, any>,
-            comments?: Record<string, string>
-        }
-
-        type ExtractSqlRawSelectInfo<const I extends SqlRawSelectInfo<any>> = 
-            Prettify<{
-                [K in keyof I['cols']]: Exclude<SqlRawSelectColTypesValues<I['cols'][K][1]> | isRequired<I['cols'][K][2]>, undefined>
-            }>
-        ;
-
-        type SqlGetFunc<const T extends ModelTemplate,const D extends boolean = false> = 
-            (builder: Sql.Builder<T['template']>, sql: PlataSql.Driver<D>) => PlataPromise<T['type'][]>
-        ;
-
-        interface CacheTable {
-            coluns: Record<string | number | symbol, Knex.ColumnInfo>
-            date: Date
-        }
-
-        interface InsertOptions {
-            ignoreTrigger?: true 
-            comments?: Record<string, string>
-        }
-
-        interface UpdateOptions {
-            comments?: Record<string, string>
-        }
-
-        interface SelectOptions {
-            comments?: Record<string, string>
-        }
-
-        type ModelQueryBuilder<T extends Model.Template> = 
-            Knex.QueryBuilder<Model.ExtractTemplateType<T>, Model.ExtractTemplateType<T>[]>
-        ;
-
-        type Builder<T extends Model.Template> = 
-            (s: ModelQueryBuilder<T>) => ModelQueryBuilder<T>
-        ;
-
-        interface StreamHandler {
-            close: <Y>() => PlataPromise<Y>
-            row: <T>(row: T) => Promise<boolean>
-            error?: (err) => Promise<void>
-        }
-
-        type ModelList<T extends Model.Template> = PlataPromise<{
-            errors: undefined
-            itens: Model.ExtractTemplateType<T>[]
-        } | {
-            errors: PlataError[]
-            itens: Model.ExtractTemplateTypeNotValid<T>[]
-        }>
-
-        type EachRowCallBack<T extends Model.Template> = 
-            (x: Model.ModelValidateReturn<T>) => PlataPromise<true>
-        ;
-
-        type TimeZoneDate = Date & { __type: 'sql' }
-
-        type TransactionFunction<T, Y> = (sql: T) => Promise<Y>
-
-        type TransactionReturn = 
-            | boolean
-            | string
-            | number
-            | Record<string, any>
-            | ((...args: any[]) => any)
-        ;
-        type TransactionResultFunction<T, Y extends TransactionReturn> = (sql: T) => PlataPromise<Y>
-
-        type Joins = 
-        'JOIN'
-        | `${
-            'LEFT' 
-            | 'CROSS'
-            | 'INNER'
-            | 'OUTER'
-            | 'RIGHT'
-            | 'FULL OUTER'
-            | 'LEFT OUTER'
-        } JOIN`
-    ;
-    }
+import { Knex } from 'knex'
+import moment from 'moment'
+
+import "@total-typescript/ts-reset/dist/filter-boolean"
+import { ModelTemplate } from '++/libs/models'
+import { PlataSql } from '..'
+
+
+declare global {
+    namespace Sql {
+
+        type SqlRawSelectColTypes =
+            | 'number'
+            | 'date'
+            | 'string'
+        ; 
+
+        type SqlRawSelectCamp<T> = 
+            [col: (s: Knex.QueryBuilder<T, any>) => Knex.QueryBuilder<T, any>, type: SqlRawSelectColTypes, required?: 'required' ]
+        ;
+
+        type SqlRawSelectColTypesValues<V extends SqlRawSelectColTypes> = 
+            V extends 'number' ? number
+            : V extends 'date' ? Date
+            : V extends 'string' ? string
+            : never
+        ;
+
+        type isRequired<I> = 
+            I extends 'required' ? undefined
+            : null
+        ;
+
+        interface SqlRawSelectInfo<T> {
+            table: string
+            cols: Record<string, SqlRawSelectCamp<T>>
+            query: (s: Knex.QueryBuilder<T, any>, t: T) => Knex.QueryBuilder<any, any>,
+            comments?: Record<string, string>
+        }
+
+        type ExtractSqlRawSelectInfo<const I extends SqlRawSelectInfo<any>> = 
+            Prettify<{
+                [K in keyof I['cols']]: Exclude<SqlRawSelectColTypesValues<I['cols'][K][1]> | isRequired<I['cols'][K][2]>, undefined>
+            }>
+        ;
+
+        type SqlGetFunc<const T extends ModelTemplate,const D extends boolean = false> = 
+            (builder: Sql.Builder<T['template']>, sql: PlataSql.Driver<D>) => PlataPromise<T['type'][]>
+        ;
+
+        interface CacheTable {
+            coluns: Record<string | number | symbol, Knex.ColumnInfo>
+            date: Date
+        }
+
+        interface InsertOptions {
+            ignoreTrigger?: true 
+            comments?: Record<string, string>
+        }
+
+        interface UpdateOptions {
+            comments?: Record<string, string>
+        }
+
+        interface SelectOptions {
+            comments?: Record<string, string>
+        }
+
+        type ModelQueryBuilder<T extends Model.Template> = 
+            Knex.QueryBuilder<Model.ExtractTemplateType<T>, Model.ExtractTemplateType<T>[]>
+        ;
+
+        type Builder<T extends Model.Template> = 
+            (s: ModelQueryBuilder<T>) => ModelQueryBuilder<T>
+        ;
+
+        interface StreamHandler {
+            close: <Y>() => PlataPromise<Y>
+            row: <T>(row: T) => Promise<boolean>
+            error?: (err) => Promise<void>
+        }
+
+        type ModelList<T extends Model.Template> = PlataPromise<{
+            errors: undefined
+            itens: Model.ExtractTemplateType<T>[]
+        } | {
+            errors: PlataError[]
+            itens: Model.ExtractTemplateTypeNotValid<T>[]
+        }>
+
+        type EachRowCallBack<T extends Model.Template> = 
+            (x: Model.ModelValidateReturn<T>) => PlataPromise<true>
+        ;
+
+        type TimeZoneDate = Date & { __type: 'sql' }
+
+        type TransactionFunction<T, Y> = (sql: T) => Promise<Y>
+
+        type TransactionReturn = 
+            | boolean
+            | string
+            | number
+            | Record<string, any>
+            | ((...args: any[]) => any)
+        ;
+        type TransactionResultFunction<T, Y extends TransactionReturn> = (sql: T) => PlataPromise<Y>
+
+        type Joins = 
+        'JOIN'
+        | `${
+            'LEFT' 
+            | 'CROSS'
+            | 'INNER'
+            | 'OUTER'
+            | 'RIGHT'
+            | 'FULL OUTER'
+            | 'LEFT OUTER'
+        } JOIN`
+    ;
+    }
 }

package/src/@types/swagger.d.ts

@@ -1,23 +1,23 @@
-declare namespace SwaggerGen {
-    interface RouteParameter {
-        name: string,
-        required: boolean,
-        in: 'path',
-        type: 'string'
-    }
-
-    interface Route {
-        httpRoute: string
-        method: string
-        params: RouteParameter[]
-    }
-
-    interface Files {
-        swaggerHeader: any
-        route: {
-            header: any,
-            body: any,
-            response: any,
-        }
-    }
+declare namespace SwaggerGen {
+    interface RouteParameter {
+        name: string,
+        required: boolean,
+        in: 'path',
+        type: 'string'
+    }
+
+    interface Route {
+        httpRoute: string
+        method: string
+        params: RouteParameter[]
+    }
+
+    interface Files {
+        swaggerHeader: any
+        route: {
+            header: any,
+            body: any,
+            response: any,
+        }
+    }
 }