pwi-plata-type 0.2.16 → 0.2.19

package/bin/extras/plata-create-api.ts

@@ -36,7 +36,11 @@ export async function h() {
                 console.log('CLUSTER AINDA NÃO CRIANDO AINDA')
             break;
             case 'route':
-                const routeArg = `${args.shift()}`.split('/')
+                const r = `${args.shift()}/`.replace(/:(.*?)(?:\/|$)/g, (_, parm) => {
+                    return parm[parm.length - 1] !== '?' ? `{${parm}}/` : `[${parm.slice(0, -1)}]/`
+                })
+
+                const routeArg = r.slice(0, -1).split('/')
 
                 const routeFileName = routeArg[routeArg.length - 1] === '' ? 'index' : routeArg.pop()
                 const routeFilePath = path.join('routes', ...routeArg.filter(v => v !== ''))

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),

package/libs/routes.ts

@@ -43,6 +43,9 @@ export async function loadExpressRoutes(): Promise<PlataRequiredRoute[]> {
                 .replace(/.(ts|js)$/, '')
                 .replace(/index/, '')
                 .replace(/\\/g, '/')
+                .replace(/\{(.*?)\}/g, ':$1')
+                .replace(/\[(.*?)\]/g, ':$1?')
+            ;
 
             return route
         })

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pwi-plata-type",
-    "version": "0.2.16",
+    "version": "0.2.19",
     "type": "module",
     "main": "index.ts",
     "bin": {

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" ]