pwi-plata-type 0.4.166 → 0.4.167

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

@@ -1,114 +1,114 @@
-interface RequiredInterface<T> {
-    filePath: string,
-    name: string,
-    exports: T
-}
-
-type RequireAsyncReturn<T> = PlataPromise<RequiredInterface<T>>
-type RequireFolderReturn<T> = PlataPromise<RequiredInterface<T>[]>
-type RequiredFolder<T> = Awaited<RequireFolderReturn<T>>
-
-type StringKeyOfObject<T extends Object> = Exclude<{
-    [name in keyof T]: 
-		name extends string ? name
-		: name extends number ? `${name}`
-		: undefined
-}[keyof T], undefined>;
-
-type AnyRecord<T> = {
-    [P in string]: T;
-}
-type LooseAutocomplete<T extends string> = T | Omit<string, T>
-
-type Replace<T, O, U> = T extends O ? Exclude<T, O> | U : T
-
-type PlataEnvDefaults = "prod" | "homolog" | "debug"
-type PlataEnv = LooseAutocomplete<PlataEnvDefaults>
-
-type PlataFunctionWrapperReturn<F extends (...a: any) => any, T> = (...a: Parameters<F>) => T
-
-type RemovePlataResult<T> = T extends PlataResult<infer U> ? Exclude<U, PlataError> : T
-
-type RemovePlataResultOnArray<T> =
-    T extends [ infer U ] ? [ RemovePlataResult<Awaited<U>> ]
-    : T extends [ infer U, ...infer V ] ? [ RemovePlataResult<Awaited<U>>, ...RemovePlataResultOnArray<V> ]
-    : []
-    //: T extends Promise<infer U>[] ? RemovePlataResult<U>[]
-    //: never
-    
-;
-
-type RemovePlataResultOnPromiseAll<T> =
-    RemovePlataResultOnArray<T> 
-    // extends [ infer U ] ? RemovePlataResultOnArray<T>
-    // : T extends Promise<infer U>[] ? 'RemovePlataResult<U>'
-    // : 'never'
-;
-
-interface PlataRuntime {}
-
-interface PlataProcess {
-
-}
-
-interface Plata extends PlataRuntime {
-    cluster: {
-        isPrimary: true,
-        clusters: Cluster.ClusterConfig[]
-    } | { isPrimary: false, clusters?: undefined }
-    config: NodeJS.ProcessEnv & {
-        ENV?: PlataEnv
-        PORT?: string
-        _PLATA_API_ROOT?: string
-        _PLATA_API_SSL_KEY?: string
-        _PLATA_API_SSL_CERT?: string
-        _PLATA_API_SSL_PASS?: string
-        _PLATA_API_JSON_SIZE?: string
-        _PLATA_WORKER_NAME?: string
-        _PLATA_WORKER_TYPE?: 'WORKER' | 'CONTROLLER'
-        _PLATA_SQL_CACHETABLE?: string
-        _PLATA_SQL_CACHETABLETIME?: string
-    }
-}
-
-declare const Plata: Plata
-
-declare const process: NodeJS.Process & PlataProcess
-
-interface EnvConfig {
-    env: PlataEnv
-}
-
-interface PlataError {
-    errorID: string
-    msg: string,
-    error?: any
-}
-
-type MaybePlataError = null | PlataError
-
-type PlataResult<T> = (T & { errorID?: undefined }) | PlataError
-
-type PlataPromise<T> = Promise<PlataResult<T>>
-
-type Dictionary<T> = {
-    [key: string]: T
-}
-
-type DictionaryRecord<K extends string | number, T> = {
-    [key in K]: T
-}
-
-interface PlataEnvConfig {
-    env: PlataEnv
-}
-
-type DeepWritable<T extends {}> = {
-    -readonly [K in keyof T]: T[K] extends Dictionary<any> ? DeepWritable<T[K]> : T[K]
-}
-
-type ArrayCombine<T extends readonly any[]> = 
-    T extends readonly [ infer U extends T[number] ] ? U
-    : T extends readonly [ infer U extends T[number], ...infer R] ? U & ArrayCombine<R>
-    : never
+interface RequiredInterface<T> {
+    filePath: string,
+    name: string,
+    exports: T
+}
+
+type RequireAsyncReturn<T> = PlataPromise<RequiredInterface<T>>
+type RequireFolderReturn<T> = PlataPromise<RequiredInterface<T>[]>
+type RequiredFolder<T> = Awaited<RequireFolderReturn<T>>
+
+type StringKeyOfObject<T extends Object> = Exclude<{
+    [name in keyof T]: 
+		name extends string ? name
+		: name extends number ? `${name}`
+		: undefined
+}[keyof T], undefined>;
+
+type AnyRecord<T> = {
+    [P in string]: T;
+}
+type LooseAutocomplete<T extends string> = T | Omit<string, T>
+
+type Replace<T, O, U> = T extends O ? Exclude<T, O> | U : T
+
+type PlataEnvDefaults = "prod" | "homolog" | "debug"
+type PlataEnv = LooseAutocomplete<PlataEnvDefaults>
+
+type PlataFunctionWrapperReturn<F extends (...a: any) => any, T> = (...a: Parameters<F>) => T
+
+type RemovePlataResult<T> = T extends PlataResult<infer U> ? Exclude<U, PlataError> : T
+
+type RemovePlataResultOnArray<T> =
+    T extends [ infer U ] ? [ RemovePlataResult<Awaited<U>> ]
+    : T extends [ infer U, ...infer V ] ? [ RemovePlataResult<Awaited<U>>, ...RemovePlataResultOnArray<V> ]
+    : []
+    //: T extends Promise<infer U>[] ? RemovePlataResult<U>[]
+    //: never
+    
+;
+
+type RemovePlataResultOnPromiseAll<T> =
+    RemovePlataResultOnArray<T> 
+    // extends [ infer U ] ? RemovePlataResultOnArray<T>
+    // : T extends Promise<infer U>[] ? 'RemovePlataResult<U>'
+    // : 'never'
+;
+
+interface PlataRuntime {}
+
+interface PlataProcess {
+
+}
+
+interface Plata extends PlataRuntime {
+    cluster: {
+        isPrimary: true,
+        clusters: Cluster.ClusterConfig[]
+    } | { isPrimary: false, clusters?: undefined }
+    config: NodeJS.ProcessEnv & {
+        ENV?: PlataEnv
+        PORT?: string
+        _PLATA_API_ROOT?: string
+        _PLATA_API_SSL_KEY?: string
+        _PLATA_API_SSL_CERT?: string
+        _PLATA_API_SSL_PASS?: string
+        _PLATA_API_JSON_SIZE?: string
+        _PLATA_WORKER_NAME?: string
+        _PLATA_WORKER_TYPE?: 'WORKER' | 'CONTROLLER'
+        _PLATA_SQL_CACHETABLE?: string
+        _PLATA_SQL_CACHETABLETIME?: string
+    }
+}
+
+declare const Plata: Plata
+
+declare const process: NodeJS.Process & PlataProcess
+
+interface EnvConfig {
+    env: PlataEnv
+}
+
+interface PlataError {
+    errorID: string
+    msg: string,
+    error?: any
+}
+
+type MaybePlataError = null | PlataError
+
+type PlataResult<T> = (T & { errorID?: undefined }) | PlataError
+
+type PlataPromise<T> = Promise<PlataResult<T>>
+
+type Dictionary<T> = {
+    [key: string]: T
+}
+
+type DictionaryRecord<K extends string | number, T> = {
+    [key in K]: T
+}
+
+interface PlataEnvConfig {
+    env: PlataEnv
+}
+
+type DeepWritable<T extends {}> = {
+    -readonly [K in keyof T]: T[K] extends Dictionary<any> ? DeepWritable<T[K]> : T[K]
+}
+
+type ArrayCombine<T extends readonly any[]> = 
+    T extends readonly [ infer U extends T[number] ] ? U
+    : T extends readonly [ infer U extends T[number], ...infer R] ? U & ArrayCombine<R>
+    : never
 ;

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

@@ -1,14 +1,14 @@
-import { Knex as KnexOriginal } from 'knex';
-import { ModelTemplate } from '++/libs/models'
-
-declare module 'knex' {
-  namespace Knex {
-    interface QueryBuilder {
-      includeOne<TRecord extends {}, TResult>(table: keyof TRecord, type: Sql.Joins,s: KnexOriginal.JoinCallback): KnexOriginal.QueryBuilder<TRecord, TResult>;
-      context<TRecord extends {}, TResult>(context: any): KnexOriginal.QueryBuilder<TRecord, TResult>;
-      context<T>(): T;
-      getConnTable<TRecord extends {}, TResult>(table: string, trxName?: string): KnexOriginal.QueryBuilder<TRecord, TResult> 
-      comment?: <TRecord extends {}, TResult>(comment: string) => KnexOriginal.QueryBuilder<TRecord, TResult>
-    }
-  }
+import { Knex as KnexOriginal } from 'knex';
+import { ModelTemplate } from '++/libs/models'
+
+declare module 'knex' {
+  namespace Knex {
+    interface QueryBuilder {
+      includeOne<TRecord extends {}, TResult>(table: keyof TRecord, type: Sql.Joins,s: KnexOriginal.JoinCallback): KnexOriginal.QueryBuilder<TRecord, TResult>;
+      context<TRecord extends {}, TResult>(context: any): KnexOriginal.QueryBuilder<TRecord, TResult>;
+      context<T>(): T;
+      getConnTable<TRecord extends {}, TResult>(table: string, trxName?: string): KnexOriginal.QueryBuilder<TRecord, TResult> 
+      comment?: <TRecord extends {}, TResult>(comment: string) => KnexOriginal.QueryBuilder<TRecord, TResult>
+    }
+  }
 }

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

@@ -1,144 +1,144 @@
-declare namespace Model {
-
-    type ValidateReturn = PlataError | null
-
-    interface PrimitiveValidationTypeReturn {
-        error?: PlataError
-        continua: boolean
-    }
-
-    type PrimitiveValidationTypeFunction<T = any, D = undefined> = 
-        (nome: string, valor: T | D) => Promise<PrimitiveValidationTypeReturn>
-    ;
-
-
-    interface PrimitiveValidationType<T = any, D = undefined> extends PrimitiveValidationTypeFunction<T, D>{
-        filter?: (value: any) => any
-    }
-
-    interface Template {
-        readonly [name: string]: 
-            readonly PrimitiveValidationType<unknown, unknown>[] |
-            readonly Template[] |
-            Template |
-            readonly (readonly PrimitiveValidationType[])[]
-    }
-
-    interface TemplateEnv {
-        readonly [name: string]: readonly PrimitiveValidationType<unknown, unknown>[] 
-    }
-
-    type GetTemplateParamType<T> = 
-        T extends readonly [ PrimitiveValidationType<infer G, infer H> ] ? G | H :
-        T extends readonly [ PrimitiveValidationType<any, infer H>,  PrimitiveValidationType<infer G, any> ] ? G | H :
-        T extends readonly [ PrimitiveValidationType<any, infer H>,  ...any[], PrimitiveValidationType<infer G, any> ] ? G | H :
-        never
-    ;
-
-    type GetTemplateEnvParamType<const T extends PrimitiveValidationType<unknown, unknown>[]> =
-        T extends readonly [ PrimitiveValidationType<infer G, infer H> ] ? `${G}` | H :
-        T extends readonly [ PrimitiveValidationType<any, infer H>,  PrimitiveValidationType<infer G, any> ] ? `${G}` | H :
-        T extends readonly [ PrimitiveValidationType<any, infer H>,  ...any[], PrimitiveValidationType<infer G, any> ] ? `${G}` | H :
-        never
-    ;
-
-    type ExtractTemplateParamType<T> = Exclude<GetTemplateParamType<T>, undefined>
-
-    type ExtractTemplateEnvParamType<const T> = Replace<Exclude<GetTemplateEnvParamType<T>, undefined>, null, undefined>
-
-    type ExtractTemplateType<T extends Template> = {
-        [P in keyof T]: T[P] extends Template ? ExtractTemplateType<T[P]> : 
-                        T[P] extends readonly Template[] ? ExtractTemplateType<T[P][0]>[] :
-                        T[P] extends readonly (readonly PrimitiveValidationType[])[] ? ExtractTemplateParamType<T[P][0]>[] : 
-                        T[P] extends readonly PrimitiveValidationType<unknown, unknown>[] ? ExtractTemplateParamType<T[P]> :
-                        number | boolean | string | null
-    }
-
-
-    type ExtractTemplateEnvType<const T extends TemplateEnv> = {
-        [P in keyof T]: ExtractTemplateEnvParamType<T[P]>
-    }
-
-    type ExtractTemplateTypeNotValid<T extends Template> = {
-        [P in keyof T]: T[P] extends Template ? ExtractTemplateTypeNotValid<T[P]> : 
-                        T[P] extends readonly Template[] ? ExtractTemplateTypeNotValid<T[P][0]>[] :
-                        T[P] extends readonly (readonly PrimitiveValidationType[])[] ? (number | boolean | string | null)[] :
-                        number | boolean | string | null
-    }
-
-    type ParcialTemplateType<T extends Template> = Partial<ExtractTemplateType<T>>
-
-    type ModelTemplateValidation<T extends Template> = (value: ExtractTemplateType<T>) => Promise<PlataError | null>
-
-    type ModelTemplateFilter<T extends Template> = (value: DeepWritable<ExtractTemplateTypeNotValid<T>>) => DeepWritable<ExtractTemplateTypeNotValid<T>>
-
-    type ModelTemplateEnvValidation<const T extends TemplateEnv> = (value: ExtractTemplateEnvType<T>) => Promise<PlataError | null>
-
-    type ModelValidateReturn<T extends Template> =
-        ModelValidateReturnHelper<ExtractTemplateType<T>, ExtractTemplateTypeNotValid<T>>
-    ;
-
-    type ModelValidateEnvReturn<const T extends TemplateEnv> = 
-        ModelValidateReturnHelper<ExtractTemplateEnvType<T>, undefined>
-    ;
-
-    type ModelValidateReturnHelper<const OKAY, const ERROR> = 
-        | {
-            errors: undefined,
-            value: OKAY
-        }
-        | {
-            errors: PlataError[]
-            value: ERROR
-        }
-    ;
-
-    type ConvertFunction<T extends Template, O> = (x: ExtractTemplateType<T>) => O
-
-    type Converters<T extends Template> = (AnyRecord<Model.ConvertFunction<T, any>>)
-
-    type GetConverterType<T extends Template, F> = F extends ConvertFunction<T, infer G> ? G : never
-
-    type ModelConvertFuntion<T extends Template, C extends Converters<T>> =
-        <K extends keyof C>(value: ExtractTemplateType<T>, to: K) => PlataResult<GetConverterType<T, C[K]>>
-    ;
-
-    interface TemplateUnionConfig {
-        key: string
-    }
-
-    interface ModelClass {
-        readonly type: Record<string | number, any>
-        filter?: (value: any) => any 
-        validate(value: any, skipFilter?: true): Promise<Model.ModelValidateReturnHelper<any, any>>
-
-    }
-    
-    type TemplateRecord = 
-        Record<string | `${number}` | `${boolean}` | 'null', ModelClass>
-    ;
-
-    type ExtractModelUnionType<const C extends TemplateUnionConfig, const R extends TemplateRecord> = {
-        [K in keyof R]: Record<C['key'], K> & R[K]['type']
-    }[keyof R]
-    
-    type RemoveTypesForFilter<T extends Record<string, any>> = {
-        -readonly [K in keyof T]: 
-            T[K] extends Record<string, any> ? RemoveTypesForFilter<T[K]>
-        : number | boolean | string | null
-        
-    } 
-
-    type ExtractModelUnionTypeFilter<const C extends TemplateUnionConfig, const R extends TemplateRecord> = {
-        [K in keyof R]: Record<C['key'], K> & RemoveTypesForFilter<R[K]['type']>
-    }[keyof R]
-
-    type ExtractModelUnionReturn<const C extends TemplateUnionConfig, const R extends TemplateRecord> = 
-        {
-            [K in keyof R]: {
-                model: R[K],
-                value: R[K]['type'] & Record<C['key'], K>
-            }
-        }[keyof R]
-    ;
+declare namespace Model {
+
+    type ValidateReturn = PlataError | null
+
+    interface PrimitiveValidationTypeReturn {
+        error?: PlataError
+        continua: boolean
+    }
+
+    type PrimitiveValidationTypeFunction<T = any, D = undefined> = 
+        (nome: string, valor: T | D) => Promise<PrimitiveValidationTypeReturn>
+    ;
+
+
+    interface PrimitiveValidationType<T = any, D = undefined> extends PrimitiveValidationTypeFunction<T, D>{
+        filter?: (value: any) => any
+    }
+
+    interface Template {
+        readonly [name: string]: 
+            readonly PrimitiveValidationType<unknown, unknown>[] |
+            readonly Template[] |
+            Template |
+            readonly (readonly PrimitiveValidationType[])[]
+    }
+
+    interface TemplateEnv {
+        readonly [name: string]: readonly PrimitiveValidationType<unknown, unknown>[] 
+    }
+
+    type GetTemplateParamType<T> = 
+        T extends readonly [ PrimitiveValidationType<infer G, infer H> ] ? G | H :
+        T extends readonly [ PrimitiveValidationType<any, infer H>,  PrimitiveValidationType<infer G, any> ] ? G | H :
+        T extends readonly [ PrimitiveValidationType<any, infer H>,  ...any[], PrimitiveValidationType<infer G, any> ] ? G | H :
+        never
+    ;
+
+    type GetTemplateEnvParamType<const T extends PrimitiveValidationType<unknown, unknown>[]> =
+        T extends readonly [ PrimitiveValidationType<infer G, infer H> ] ? `${G}` | H :
+        T extends readonly [ PrimitiveValidationType<any, infer H>,  PrimitiveValidationType<infer G, any> ] ? `${G}` | H :
+        T extends readonly [ PrimitiveValidationType<any, infer H>,  ...any[], PrimitiveValidationType<infer G, any> ] ? `${G}` | H :
+        never
+    ;
+
+    type ExtractTemplateParamType<T> = Exclude<GetTemplateParamType<T>, undefined>
+
+    type ExtractTemplateEnvParamType<const T> = Replace<Exclude<GetTemplateEnvParamType<T>, undefined>, null, undefined>
+
+    type ExtractTemplateType<T extends Template> = {
+        [P in keyof T]: T[P] extends Template ? ExtractTemplateType<T[P]> : 
+                        T[P] extends readonly Template[] ? ExtractTemplateType<T[P][0]>[] :
+                        T[P] extends readonly (readonly PrimitiveValidationType[])[] ? ExtractTemplateParamType<T[P][0]>[] : 
+                        T[P] extends readonly PrimitiveValidationType<unknown, unknown>[] ? ExtractTemplateParamType<T[P]> :
+                        number | boolean | string | null
+    }
+
+
+    type ExtractTemplateEnvType<const T extends TemplateEnv> = {
+        [P in keyof T]: ExtractTemplateEnvParamType<T[P]>
+    }
+
+    type ExtractTemplateTypeNotValid<T extends Template> = {
+        [P in keyof T]: T[P] extends Template ? ExtractTemplateTypeNotValid<T[P]> : 
+                        T[P] extends readonly Template[] ? ExtractTemplateTypeNotValid<T[P][0]>[] :
+                        T[P] extends readonly (readonly PrimitiveValidationType[])[] ? (number | boolean | string | null)[] :
+                        number | boolean | string | null
+    }
+
+    type ParcialTemplateType<T extends Template> = Partial<ExtractTemplateType<T>>
+
+    type ModelTemplateValidation<T extends Template> = (value: ExtractTemplateType<T>) => Promise<PlataError | null>
+
+    type ModelTemplateFilter<T extends Template> = (value: DeepWritable<ExtractTemplateTypeNotValid<T>>) => DeepWritable<ExtractTemplateTypeNotValid<T>>
+
+    type ModelTemplateEnvValidation<const T extends TemplateEnv> = (value: ExtractTemplateEnvType<T>) => Promise<PlataError | null>
+
+    type ModelValidateReturn<T extends Template> =
+        ModelValidateReturnHelper<ExtractTemplateType<T>, ExtractTemplateTypeNotValid<T>>
+    ;
+
+    type ModelValidateEnvReturn<const T extends TemplateEnv> = 
+        ModelValidateReturnHelper<ExtractTemplateEnvType<T>, undefined>
+    ;
+
+    type ModelValidateReturnHelper<const OKAY, const ERROR> = 
+        | {
+            errors: undefined,
+            value: OKAY
+        }
+        | {
+            errors: PlataError[]
+            value: ERROR
+        }
+    ;
+
+    type ConvertFunction<T extends Template, O> = (x: ExtractTemplateType<T>) => O
+
+    type Converters<T extends Template> = (AnyRecord<Model.ConvertFunction<T, any>>)
+
+    type GetConverterType<T extends Template, F> = F extends ConvertFunction<T, infer G> ? G : never
+
+    type ModelConvertFuntion<T extends Template, C extends Converters<T>> =
+        <K extends keyof C>(value: ExtractTemplateType<T>, to: K) => PlataResult<GetConverterType<T, C[K]>>
+    ;
+
+    interface TemplateUnionConfig {
+        key: string
+    }
+
+    interface ModelClass {
+        readonly type: Record<string | number, any>
+        filter?: (value: any) => any 
+        validate(value: any, skipFilter?: true): Promise<Model.ModelValidateReturnHelper<any, any>>
+
+    }
+    
+    type TemplateRecord = 
+        Record<string | `${number}` | `${boolean}` | 'null', ModelClass>
+    ;
+
+    type ExtractModelUnionType<const C extends TemplateUnionConfig, const R extends TemplateRecord> = {
+        [K in keyof R]: Record<C['key'], K> & R[K]['type']
+    }[keyof R]
+    
+    type RemoveTypesForFilter<T extends Record<string, any>> = {
+        -readonly [K in keyof T]: 
+            T[K] extends Record<string, any> ? RemoveTypesForFilter<T[K]>
+        : number | boolean | string | null
+        
+    } 
+
+    type ExtractModelUnionTypeFilter<const C extends TemplateUnionConfig, const R extends TemplateRecord> = {
+        [K in keyof R]: Record<C['key'], K> & RemoveTypesForFilter<R[K]['type']>
+    }[keyof R]
+
+    type ExtractModelUnionReturn<const C extends TemplateUnionConfig, const R extends TemplateRecord> = 
+        {
+            [K in keyof R]: {
+                model: R[K],
+                value: R[K]['type'] & Record<C['key'], K>
+            }
+        }[keyof R]
+    ;
 }