pwi-plata-type 0.2.15 → 0.2.18

package/Dockerfile

@@ -1,13 +1,18 @@
-FROM node:16-alpine
+FROM node:16-alpine AS build
 
 WORKDIR /usr/src/app
 
-COPY package*.json ./
+COPY . ./
+
+RUN npm ci --only=production && \
+    npm run build
+
+FROM node:16-alpine AS bin
 
 EXPOSE 3050
 
-RUN npm ci --only=production
+WORKDIR /usr/src/app
 
-COPY . ./
+COPY --from=build /usr/src/app/build .
 
-CMD [ "node", "/usr/src/app" ]
+CMD [ "npm", "start" ]

package/libs/model.ts

@@ -12,6 +12,8 @@ export interface RetornoValicadaoModel {
 
 export type ModelValicacao = (value: any) => Promise<PlataError | null>
 
+export type ModelTratamento<T> = (value: T) => T
+
 export type ModelValicacaoPrimitivo = (nome: string, valor: any) => Promise<RetornoValidacaoPrimitivo>
 
 export interface ModelType {
@@ -21,6 +23,7 @@ export interface ModelType {
 export class Model {
     public readonly template: ModelType
     public readonly validacoes: Map<string, ModelValicacao>
+    public readonly tratamentos: Map<string, ModelTratamento<any>>
 
     constructor(template: ModelType) {
         this.template = template
@@ -30,6 +33,10 @@ export class Model {
     public addValidacao(nome: string, callback: ModelValicacao) {
         this.validacoes.set(nome, callback)
     }
+
+    public addTratamento<T>(nome: string, callback: ModelTratamento<T>) {
+        this.tratamentos.set(nome, callback)
+    }
 }
 
 export async function _validaCampo(value: any, pipelines: ModelValicacaoPrimitivo[], name: string): Promise<PlataError | null> {
@@ -48,6 +55,14 @@ export async function _validaCampo(value: any, pipelines: ModelValicacaoPrimitiv
     return null
 }
 
+export function _trataModel<T>(value: T, model: Model): T {
+    model.tratamentos.forEach(tratamento => {
+        value = tratamento(value)
+    })
+
+    return value
+}
+
 export function _filtraModel(value: any, model: Model): any {
     for (const campo in model.template) {
         const t = model.template[campo]
@@ -169,6 +184,8 @@ export async function _validaModel(value: any, model: Model, name?: string): Pro
 export async function valida(value: any, model: Model): Promise<RetornoValicadaoModel> {
     value = _filtraModel(value, model)
 
+    value = _trataModel(value, model)
+
     return {
         value,
         errors: await _validaModel(value, model),
@@ -279,7 +296,9 @@ export function Int(): ModelValicacaoPrimitivo {
             }
         }
 
-        if (Math.round(valor) !== valor) {
+        const v = +valor
+
+        if (Math.round(v) !== v) {
             return {
                 error: {
                     errorID: "BPMVINT002",

package/libs/swagger.ts

@@ -45,7 +45,8 @@ export namespace PlataSwagger {
 
                 obj.paths[httpPath][metodo] = { ...header, responses: response }
 
-                if (body !== {}) {
+                //https://bobbyhadz.com/blog/javascript-check-if-object-is-empty
+                if (Object.keys(body).length !== 0) {
                     if (!Array.isArray(obj.paths[httpPath][metodo].parameters)) {
                         obj.paths[httpPath][metodo].parameters = []
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pwi-plata-type",
-    "version": "0.2.15",
+    "version": "0.2.18",
     "type": "module",
     "main": "index.ts",
     "bin": {
@@ -23,7 +23,7 @@
         "jest": "^28.1.1",
         "swagger-ui-express": "^4.4.0",
         "ts-jest": "^28.0.4",
-        "ts-node": "^10.8.1"
+        "ts-node": "10.8.2"
     },
     "description": "",
     "devDependencies": {

package/templates/postinstall/api/Dockerfile

@@ -1,13 +1,18 @@
-FROM node:16-alpine
+FROM node:16-alpine AS build
 
 WORKDIR /usr/src/app
 
-COPY package*.json ./
+COPY . ./
+
+RUN npm ci --only=production && \
+    npm run build
+
+FROM node:16-alpine AS bin
 
 EXPOSE 3050
 
-RUN npm ci --only=production
+WORKDIR /usr/src/app
 
-COPY . ./
+COPY --from=build /usr/src/app/build .
 
 CMD [ "npm", "start" ]