pwi-plata-type 0.4.141 → 0.4.143

package/__BUILD__/libs/models/index.js

@@ -18,4 +18,5 @@ __exportStar(require("./model-validations"), exports);
 __exportStar(require("./model-template"), exports);
 __exportStar(require("./model-template-env"), exports);
 __exportStar(require("./model-template-union"), exports);
+__exportStar(require("./model-template-combine"), exports);
 //# sourceMappingURL=index.js.map

package/__BUILD__/libs/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/libs/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAmC;AACnC,mDAAgC;AAChC,uDAAoC;AACpC,yDAAsC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/libs/models/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAmC;AACnC,mDAAgC;AAChC,uDAAoC;AACpC,yDAAsC;AACtC,2DAAwC"}

package/__BUILD__/libs/models/model-template-combine.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModelTemplateCombine = void 0;
+class ModelTemplateCombine {
+    type;
+    models;
+    validations;
+    constructor(models) {
+        this.models = models;
+    }
+    addValidation(callback) {
+        this.validations.add(callback);
+    }
+    async validate(obj) {
+        let v = obj;
+        for (let i = 0; i < this.models.length; i++) {
+            const model = this.models[i];
+            if (model.filter !== undefined) {
+                v = model.filter(v);
+            }
+        }
+        {
+            const promises = [];
+            for (let i = 0; i < this.models.length; i++) {
+                const model = this.models[i];
+                promises.push(Plata.FastPromise(() => model.validate(v, true)));
+            }
+            const results = await Promise.all(promises);
+            const errors = results
+                .filter((r) => r !== undefined)
+                .flatMap(r => r.errors);
+            if (errors.length !== 0) {
+                return {
+                    value: undefined,
+                    errors
+                };
+            }
+        }
+        {
+            const promises = [];
+            this.validations.forEach(va => promises.push(Plata.FastPromise(() => va(v))));
+            const result = await Promise.all(promises);
+            const errors = result.filter(Boolean);
+            if (errors.length !== 0) {
+                return {
+                    errors,
+                    value: undefined
+                };
+            }
+        }
+        return {
+            value: v,
+            errors: undefined
+        };
+    }
+}
+exports.ModelTemplateCombine = ModelTemplateCombine;
+//# sourceMappingURL=model-template-combine.js.map

package/__BUILD__/libs/models/model-template-combine.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-template-combine.js","sourceRoot":"","sources":["../../../src/libs/models/model-template-combine.ts"],"names":[],"mappings":";;;AAAA,MAAa,oBAAoB;IACpB,IAAI,CAAyB;IAC7B,MAAM,CAAG;IACF,WAAW,CAAiE;IAE5F,YAAY,MAAS;QACjB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAEM,aAAa,CAAC,QAAoE;QACrF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IAClC,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,GAAQ;QAC1B,IAAI,CAAC,GAAG,GAAG,CAAA;QACX,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACzC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;YAE5B,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE;gBAC5B,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;aACtB;SACJ;QAED;YACI,MAAM,QAAQ,GAAyC,EAAE,CAAA;YAEzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACzC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBAE7B,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;aAClE;YAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YAE3C,MAAM,MAAM,GAAG,OAAO;iBACjB,MAAM,CAAC,CAAC,CAAC,EAAiC,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC;iBAC7D,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAC1B;YAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACrB,OAAO;oBACH,KAAK,EAAE,SAAS;oBAChB,MAAM;iBACT,CAAA;aACJ;SACJ;QAID;YACI,MAAM,QAAQ,GAAoC,EAAE,CAAA;YAEpD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAC1B,QAAQ,CAAC,IAAI,CACT,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CACjC,CACJ,CAAA;YAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YAE1C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YAErC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACrB,OAAQ;oBACJ,MAAM;oBACN,KAAK,EAAE,SAAS;iBACnB,CAAA;aACJ;SACJ;QAED,OAAO;YACH,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,SAAS;SACpB,CAAA;IACL,CAAC;CACJ;AA3ED,oDA2EC"}

package/__BUILD__/libs/models/model-template-union.js

@@ -25,7 +25,17 @@ class ModelTemplateUnion {
             value: value,
         };
     }
-    async validate(value) {
+    filter(value) {
+        const extraced = this.getExtractFromUnion(value);
+        if (extraced.errorID !== undefined) {
+            return value;
+        }
+        if (extraced.model.filter !== undefined) {
+            value = extraced.model.filter(value);
+        }
+        return value;
+    }
+    async validate(value, skipFilter) {
         const extraced = this.getExtractFromUnion(value);
         if (extraced.errorID !== undefined) {
             return {
@@ -33,7 +43,7 @@ class ModelTemplateUnion {
                 value: undefined
             };
         }
-        const result = await extraced.model.validate(extraced.value);
+        const result = await extraced.model.validate(extraced.value, skipFilter);
         if (result.errors !== undefined) {
             return {
                 errors: result.errors,

package/__BUILD__/libs/models/model-template-union.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-template-union.js","sourceRoot":"","sources":["../../../src/libs/models/model-template-union.ts"],"names":[],"mappings":";;;AAAA,MAAa,kBAAkB;IACX,MAAM,CAAG;IACT,SAAS,CAAG;IACZ,IAAI,CAAmC;IAEvD,YAAY,MAAS,EAAE,SAAY;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC9B,CAAC;IAEM,mBAAmB,CAAC,KAAU;QACjC,IAAI,IAAI,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAA;QAC9C,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,CAAA;QAEvD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAErC,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,OAAO;gBACH,OAAO,EAAE,mBAAmB;gBAC5B,GAAG,EAAE,cAAc,IAAI,CAAC,MAAM,CAAC,GAAG,gBAAgB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACzF,KAAK,EAAE,IAAI;aACd,CAAA;SACJ;QAED,OAAO;YACH,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,KAAK;SACR,CAAA;IACZ,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,KAAU;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;QAEhD,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS,EAAE;YAChC,OAAO;gBACH,MAAM,EAAE,CAAC,QAAQ,CAAC;gBAClB,KAAK,EAAE,SAAS;aACnB,CAAA;SACJ;QAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAE5D,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE;YAC7B,OAAO;gBACH,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,KAAK,EAAE,SAAS;aACnB,CAAA;SACJ;QAED,OAAO;YACH,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,MAAM,CAAC,KAAK;SACtB,CAAA;IACL,CAAC;CACJ;AAtDD,gDAsDC"}
+{"version":3,"file":"model-template-union.js","sourceRoot":"","sources":["../../../src/libs/models/model-template-union.ts"],"names":[],"mappings":";;;AAAA,MAAa,kBAAkB;IACX,MAAM,CAAG;IACT,SAAS,CAAG;IACZ,IAAI,CAAmC;IAEvD,YAAY,MAAS,EAAE,SAAY;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;IAC9B,CAAC;IAEM,mBAAmB,CAAC,KAAU;QACjC,IAAI,IAAI,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAA;QAC9C,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,CAAA;QAEvD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAErC,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,OAAO;gBACH,OAAO,EAAE,mBAAmB;gBAC5B,GAAG,EAAE,cAAc,IAAI,CAAC,MAAM,CAAC,GAAG,gBAAgB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACzF,KAAK,EAAE,IAAI;aACd,CAAA;SACJ;QAED,OAAO;YACH,KAAK,EAAE,QAAQ;YACf,KAAK,EAAE,KAAK;SACR,CAAA;IACZ,CAAC;IAKM,MAAM,CAAC,KAAU;QACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;QAEhD,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS,EAAE;YAChC,OAAO,KAAK,CAAA;SACf;QAED,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE;YACrC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;SACvC;QAED,OAAO,KAAK,CAAA;IAChB,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,KAAU,EAAE,UAAiB;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;QAEhD,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS,EAAE;YAChC,OAAO;gBACH,MAAM,EAAE,CAAC,QAAQ,CAAC;gBAClB,KAAK,EAAE,SAAS;aACnB,CAAA;SACJ;QAED,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAA;QAExE,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE;YAC7B,OAAO;gBACH,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,KAAK,EAAE,SAAS;aACnB,CAAA;SACJ;QAED,OAAO;YACH,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,MAAM,CAAC,KAAK;SACtB,CAAA;IACL,CAAC;CACJ;AAvED,gDAuEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pwi-plata-type",
-    "version": "0.4.141",
+    "version": "0.4.143",
     "main": "__BUILD__/index",
     "types": "src/@types/exported.d.ts",
     "bin": {

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

@@ -104,4 +104,10 @@ interface PlataEnvConfig {
 
 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/libs/models/index.ts

@@ -1,4 +1,5 @@
 export * from './model-validations'
 export * from './model-template'
 export * from './model-template-env'
-export * from './model-template-union'
+export * from './model-template-union'
+export * from './model-template-combine'

package/src/libs/models/model-template-combine.ts

@@ -0,0 +1,76 @@
+export class ModelTemplateCombine<const T extends readonly Model.ModelClass[]> {
+    readonly type: ArrayCombine<T>['type']
+    readonly models: T
+    public readonly validations: Set<(value: typeof this.type) => Promise<Model.ValidateReturn>>
+
+    constructor(models: T) {
+        this.models = models
+    }
+
+    public addValidation(callback: (value: typeof this.type) => Promise<Model.ValidateReturn>) {
+        this.validations.add(callback)
+    }
+
+    public async validate(obj: any): Promise<Model.ModelValidateReturnHelper<typeof this.type, undefined>> {
+        let v = obj
+        for (let i = 0; i < this.models.length; i++) {
+            const model = this.models[i]
+
+            if (model.filter !== undefined) {
+                v = model.filter(v)
+            }
+        }
+
+        { // Valida as models
+            const promises: Promise<{ errors?: PlataError[] }>[] = []
+
+            for (let i = 0; i < this.models.length; i++) {
+                const model = this.models[i];
+                
+                promises.push(Plata.FastPromise(() => model.validate(v, true)))
+            }
+
+            const results = await Promise.all(promises)
+
+            const errors = results
+                .filter((r): r is { errors: PlataError[] } => r !== undefined)
+                .flatMap(r => r.errors)
+            ;
+
+            if (errors.length !== 0) {
+                return {
+                    value: undefined,
+                    errors
+                }
+            }
+        }
+
+        
+
+        { // Validacoes adicionais
+            const promises: Promise<Model.ValidateReturn>[] = []
+
+            this.validations.forEach(va => 
+                promises.push(
+                    Plata.FastPromise(() => va(v))
+                )
+            )
+
+            const result = await Promise.all(promises)
+
+            const errors = result.filter(Boolean)
+
+            if (errors.length !== 0) {
+                return  {
+                    errors,
+                    value: undefined
+                }
+            }
+        }
+
+        return {
+            value: v,
+            errors: undefined
+        } 
+    }
+}

package/src/libs/models/model-template-union.ts

@@ -28,7 +28,24 @@ export class ModelTemplateUnion<const C extends Model.TemplateUnionConfig, const
         } as any
     }
 
-    public async validate(value: any): Promise<Model.ModelValidateReturnHelper<typeof this.type, undefined>> {
+    /**
+     * Essa função so é para ser usada dentro da plataforma, considera que logo depois será rodado o validate
+     */
+    public filter(value: any): any {
+        const extraced = this.getExtractFromUnion(value)
+
+        if (extraced.errorID !== undefined) {
+            return value
+        }
+
+        if (extraced.model.filter !== undefined) {
+            value = extraced.model.filter(value)
+        }
+
+        return value
+    }
+
+    public async validate(value: any, skipFilter?: true): Promise<Model.ModelValidateReturnHelper<typeof this.type, undefined>> {
         const extraced = this.getExtractFromUnion(value)
 
         if (extraced.errorID !== undefined) {
@@ -38,7 +55,7 @@ export class ModelTemplateUnion<const C extends Model.TemplateUnionConfig, const
             }
         }
 
-        const result = await extraced.model.validate(extraced.value)
+        const result = await extraced.model.validate(extraced.value, skipFilter)
 
         if (result.errors !== undefined) {
             return {