pwi-plata-type 0.3.4 → 0.3.5

package/Dockerfile

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

package/bin/extras/plata-build-tool.ts

@@ -1,7 +1,7 @@
 import { spawn } from 'node:child_process'
 import fs from 'node:fs'
 import path from 'node:path'
-import { PlataResultado, PlataDirs, PlataFiles, PlataError } from '../../libs/tools.js';
+import { PlataResultado, PlataDirs, PlataFiles, PlataError } from '../../libs/tools';
 
 export namespace tools {
     export interface ProcessExit {
@@ -14,7 +14,8 @@ export namespace tools {
         return new Promise((resolve) => {
             try {
                 const p = spawn(command, args, {
-                    cwd: cwd
+                    cwd: cwd,
+                    shell: true
                 })
 
                 let stdout, stderr = ''

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

@@ -1,5 +1,5 @@
-import { tools } from "./plata-create-tools.js";
-import { PlataDirs } from "../../libs/tools.js"
+import { tools } from "./plata-create-tools";
+import { PlataDirs } from "../../libs/tools"
 import path from 'node:path'
 
 export async function h() {

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

@@ -1,4 +1,4 @@
-import { tools } from "./plata-create-tools.js";
+import { tools } from "./plata-create-tools";
 
 export async function h() {
     return tools.args.forEachArg(async (command, args) => {

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

@@ -1,7 +1,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 
-import { PlataDirs, PlataFiles } from '../../libs/tools.js'
+import { PlataDirs, PlataFiles } from '../../libs/tools'
 
 export namespace tools {
     export namespace files {

package/bin/plata-build.ts

@@ -1,5 +1,5 @@
-import { tools } from './extras/plata-build-tool.js'
-import { PlataResultado, PlataDirs } from '../libs/tools.js'
+import { tools } from './extras/plata-build-tool'
+import { PlataResultado, PlataDirs } from '../libs/tools'
 
 const main = async () => {
     // Prepara o JSONs

package/bin/plata-create.ts

@@ -1,4 +1,7 @@
-import { PlataDirs } from "../libs/tools.js";
+import { PlataDirs } from "../libs/tools"
+
+import * as PlataCreateApi from "./extras/plata-create-api"
+import * as PlataCreateLib from "./extras/plata-create-lib"
 
 interface Handler {
     h: () => Promise<void>
@@ -13,14 +16,12 @@ const main = async () => {
         
     }
 
-    let handler: Handler
-
     switch(projectPackage.plata_type ?? 'api') {
         case 'api':
-            handler = (await import(PlataDirs.getPlataBinExtraFile('plata-create-api.js'))) as unknown as Handler
+            await PlataCreateApi.h()
         break;
         case 'lib':
-            handler = (await import(PlataDirs.getPlataBinExtraFile('plata-create-lib.js'))) as unknown as Handler
+            await PlataCreateLib.h()
         break;
         default:
             console.log(`tipo ${projectPackage.plata_type} não suportado pela plata`)
@@ -28,7 +29,6 @@ const main = async () => {
         break;
     }
 
-    await handler.h()
 }
 
 main()

package/bin/plata-reload.ts

@@ -0,0 +1,13 @@
+import { tools } from './extras/plata-build-tool'
+import { PlataDirs } from '../libs/tools'
+
+
+const main = async () => {
+    console.log(await tools.runIn(
+        'node',
+        [ 'postinstall.mjs' ],
+        PlataDirs.getPlataDir()
+    ))
+}
+
+main()

package/bin/plata-swagger-gen.ts

@@ -1,7 +1,7 @@
 import path from 'node:path'
 import fs from 'node:fs'
-import { buildExpressRouter } from '../libs/routes.js'
-import { PlataResultado, PlataDirs, PlataFiles, PlataError } from '../libs/tools.js'
+import { buildExpressRouter } from '../libs/routes'
+import { PlataResultado, PlataDirs, PlataFiles, PlataError } from '../libs/tools'
 
 interface dumpParameter { 
     name: string,
@@ -142,6 +142,9 @@ async function dumpRotas(): Promise<dumpRoute[]> {
 }
 
 const main = async () => {
+    // TODO :: Colocar isso em um function que inicializa a process._plata ou n usa isso mais
+    (process as any)._plata = new Object(null)
+
     const rotas = await dumpRotas()
     const files = loadSwaggerFiles()
 

package/bin/plata.ts

@@ -1,10 +1,10 @@
-import { PlataClusterManager, PlataClusterMsg } from "../libs/cluster.js"
-import { loadEnvProjectFile } from "../libs/env.js"
-import { buildExpressRouter } from "../libs/routes.js"
+import { PlataClusterManager, PlataClusterMsg } from "../libs/cluster"
+import { loadEnvProjectFile } from "../libs/env"
+import { buildExpressRouter } from "../libs/routes"
 import express, { Express } from "express"
 import { createServer } from 'node:https'
 import fs from 'node:fs'
-import { PlataDirs } from "../libs/tools.js"
+import { PlataDirs } from "../libs/tools"
 import path from 'node:path'
 
 const main = async () => {

package/index.ts

@@ -1,9 +1,9 @@
-import * as PlataCluster from './libs/cluster.js'
-import * as PlataEnv from './libs/env.js'
-import * as PlataRoutes from './libs/routes.js'
-import * as PlataTools from './libs/tools.js'
-import * as PlataModels from './libs/model.js'
-import { PlataSwagger } from './libs/swagger.js'
+import * as PlataCluster from './libs/cluster'
+import * as PlataEnv from './libs/env'
+import * as PlataRoutes from './libs/routes'
+import * as PlataTools from './libs/tools'
+import * as PlataModels from './libs/model'
+import { PlataSwagger } from './libs/swagger'
 
 export {
     PlataCluster,

package/libs/cluster.ts

@@ -1,4 +1,4 @@
-import { PlataRequire, PlataDirs, PlataFiles } from './tools.js'
+import { PlataRequire, PlataDirs, PlataFiles } from './tools'
 import { cpus } from 'node:os'
 import * as typeCluster from 'node:cluster'
 
@@ -153,14 +153,14 @@ export class PlataClusterManager {
             [
                 PlataDirs.getProjectDirClusters()
             ],
-            `${process.env["_plata_name"]}.ts`
+            `${process.env["_plata_name"]}`
         ).catch(err => {
             console.error(err)
             return null
         })
 
         if (file !== null) {
-            const config: PlataClusterWorkerConfig = (await import(`file:///${file}`.replace(/\\/g, '/'))).default
+            const config: PlataClusterWorkerConfig = (await import(file.replace(/\\/g, '/'))).default
 
             await config.onStart()
         }

package/libs/env.ts

@@ -1,4 +1,4 @@
-import { PlataDirs, PlataFiles } from "./tools.js"
+import { PlataDirs, PlataFiles } from "./tools"
 
 export interface EnvConfig {
     readonly env: 'prod' | 'debug' | 'homolog' | string
@@ -6,7 +6,7 @@ export interface EnvConfig {
 
 export async function loadEnvProjectFile() {
     const config = process.env['ENV'] === undefined ? 
-        (await import(PlataDirs.getProjectConfigFileDir('env.js'))).default as EnvConfig
+        (await import(PlataDirs.getProjectConfigFileDir('env'))).default as EnvConfig
         : { env: process.env['ENV'] }
 
     return PlataFiles.readFileAsync(

package/libs/model.ts

@@ -1,4 +1,4 @@
-import { PlataError } from "./tools.js"
+import { PlataError } from "./tools"
 
 export interface RetornoValidacaoPrimitivo {
     error?: PlataError

package/libs/routes.ts

@@ -1,5 +1,5 @@
 import path from 'node:path'
-import { PlataDirs, PlataRequire, PlataError } from "./tools.js";
+import { PlataDirs, PlataRequire, PlataError } from "./tools";
 import express, { Router } from "express";
 
 export const HttpMethodsArray = [
@@ -206,7 +206,7 @@ export async function loadExpressRoutes(): Promise<PlataRequiredRoute[]> {
         r = r.map(route => {
             route.httpRoute = route.filePath
                 .replace(PlataDirs.getProjectRoutesDir(), '')
-                .replace(/.(ts|js)$/, '')
+                .replace(/\.ts|\.js$/, '')
                 .replace(/index/, '')
                 .replace(/\\/g, '/')
                 .replace(/\{(.*?)\}/g, ':$1')

package/libs/swagger.ts

@@ -1,7 +1,7 @@
 import swaggerUi from 'swagger-ui-express'
 import path from 'node:path'
-import { PlataRouterBuilder, PlataRequestHandler } from './routes.js';
-import { PlataFiles, PlataDirs } from "./tools.js";
+import { PlataRouterBuilder, PlataRequestHandler } from './routes';
+import { PlataFiles, PlataDirs } from "./tools";
 
 export namespace PlataSwagger {
     export const swagger: PlataRouterBuilder = async (router) => {

package/libs/tools.ts

@@ -35,7 +35,7 @@ export namespace PlataDirs {
     }
 
     export function getProjectConfigFileDir(file: string): string {
-        return `file:///${path.resolve('.', 'configs', file)}`.replace(/\\/g, '/')
+        return path.resolve('.', 'configs', file).replace(/\\/g, '/')
     }
 
     export function getProjectDirEnvs(): string {
@@ -69,7 +69,7 @@ export namespace PlataDirs {
     }
 
     export function getPlataBinExtraFile(file: string): string {
-        return `file:///${path.join(getPlataDir(), 'bin', 'extras', file)}`.replace(/\\/g, '/')
+        return `${path.join(getPlataDir(), 'bin', 'extras', file)}`.replace(/\\/g, '/')
     }
 
 }
@@ -194,7 +194,7 @@ export namespace PlataRequire {
     export async function requireAsync<Type>(file: string): Promise<Required<Type>> {
         const p = path.resolve(file)
 
-        const e = await import(`file:///${p}`.replace(/\\/g, '/')).catch(e => { return {_plataError: e }  })
+        const e = await import(p.replace(/\\/g, '/')).catch(e => { return {_plataError: e }  })
 
         if (e._plataError !== undefined) {
             return {
@@ -218,7 +218,7 @@ export namespace PlataRequire {
         glob.sync(`${p.replace(/\\/g, '/')}/**/*.+(js|ts)`)
             .filter(file => !file.endsWith('.d.ts'))
             .forEach(file => {
-                file = file.replace('.ts', '.js')
+                file = file.replace(/\.ts|\.js$/, '')
 
                 promises.push(requireAsync<Type>(file))
             })

package/package.json

@@ -1,20 +1,21 @@
 {
     "name": "pwi-plata-type",
-    "version": "0.3.4",
-    "type": "module",
+    "version": "0.3.5",
     "main": "index.ts",
     "bin": {
         "plata": "bin/plata.ts",
         "plata-cli-create": "bin/plata-create.ts",
-        "plata-swagger-gen": "bin/plata-swagger-gen.ts"
+        "plata-swagger-gen": "bin/plata-swagger-gen.ts",
+        "plata-reload": "bin/plata-reload.ts"
     },
     "scripts": {
-        "postinstall": "node postinstall.js"
+        "postinstall": "node postinstall.mjs"
     },
     "keywords": [],
     "author": "",
     "license": "UNLICENSED",
     "dependencies": {
+        "@swc/core": "^1.2.218",
         "@types/express": "^4.17.13",
         "@types/glob": "^7.2.0",
         "@types/jest": "^28.1.1",
@@ -23,8 +24,9 @@
         "jest": "^28.1.1",
         "swagger-ui-express": "^4.4.0",
         "ts-jest": "^28.0.4",
-        "ts-node": "10.8.2",
-        "express": "^4.18.1"
+        "ts-node": "^10.9.1",
+        "express": "^4.18.1",
+        "tsconfig-paths": "^4.0.0"
     },
     "description": "",
     "devDependencies": {

package/{postinstall.js → postinstall.mjs}

@@ -15,6 +15,10 @@ const main = async () => {
     projectPackageJson.plata_type = projectPackageJson.plata_type ?? 'api'
     projectPackageJson.plata_name = plataPackageJson.name
     projectPackageJson.license = "UNLICENSED"
+    projectPackageJson['scripts_plata'] = projectPackageJson['scripts_plata'] ?? new Object(null)
+
+    // https://developer.mozilla.org/en-US/docs/Glossary/Deep_copy
+    projectPackageJson.scripts = JSON.parse(JSON.stringify(projectPackageJson['scripts_plata']))
 
     const templateDir = path.join(templatesDir, projectPackageJson.plata_type)
 

package/templates/create-cli/lib.ts

@@ -1,5 +1,5 @@
 //@ts-nocheck
-import * as ç__Name__çConfig from '../configs/ç__name__ç.js'
+import * as ç__Name__çConfig from '@Configs/ç__name__ç'
 
 export class ç__Name__ç {
     private readonly config: typeof ç__Name__çConfig.default

package/templates/postinstall/api/Dockerfile

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

package/templates/postinstall/api/_install.mjs

@@ -18,13 +18,12 @@ export async function install({ dirs, projectPackageJson }) {
     promises.push(t.copyFileToProject('Dockerfile'))
     promises.push(t.syncFileToProject('tsconfig.json'))
 
-    projectPackageJson.type = "module"
-    projectPackageJson.scripts = new Object(null)
-    projectPackageJson.scripts.start = `ts-node --transpile-only --esm ./node_modules/${projectPackageJson.plata_name}/bin/plata`
-    projectPackageJson.scripts.build = `npx tsc && ts-node --transpile-only --esm ./node_modules/${projectPackageJson.plata_name}/bin/plata-build --`
-    projectPackageJson.scripts.create = `ts-node --transpile-only --esm ./node_modules/${projectPackageJson.plata_name}/bin/plata-create --`
+    projectPackageJson.scripts.start = `ts-node -P ./tsconfig.json ./node_modules/${projectPackageJson.plata_name}/bin/plata`
+    projectPackageJson.scripts.build = `npx tsc && ts-node -P ./tsconfig.json ./node_modules/${projectPackageJson.plata_name}/bin/plata-build --`
+    projectPackageJson.scripts.create = `ts-node -P ./tsconfig.json ./node_modules/${projectPackageJson.plata_name}/bin/plata-create --`
     projectPackageJson.scripts.dev = "npx nodemon -e '.js,.mjs,.json,.ts' --exec 'npm start'"
-    projectPackageJson.scripts['swagger:gen'] = `ts-node --transpile-only --esm ./node_modules/${projectPackageJson.plata_name}/bin/plata-swagger-gen`
+    projectPackageJson.scripts['swagger:gen'] = `ts-node -P ./tsconfig.json ./node_modules/${projectPackageJson.plata_name}/bin/plata-swagger-gen`
+    projectPackageJson.scripts['plata:reload'] = `ts-node -P ./tsconfig.json ./node_modules/${projectPackageJson.plata_name}/bin/plata-reload.ts`
     projectPackageJson.main = undefined
 
     await Promise.all(promises)

package/templates/postinstall/api/tsconfig.json

@@ -1,16 +1,40 @@
 {
+    "ts-node": {
+        "transpileOnly": true,
+        "swc": true,
+        "esm": false,
+        "project": "./tsconfig.json",
+        "skipIgnore": true,
+        "require": [
+          "tsconfig-paths/register"
+        ],
+        "compilerOptions": {
+            "module": "CommonJS"
+        }
+    },
     "compilerOptions": {
-        "strictNullChecks": true,
-        "module": "es2022",
-        "target": "es2022",
-        "declaration": false,
-        "sourceMap": false,
-        "esModuleInterop": true,
-        "outDir": "build",
-        "moduleResolution": "node"
+      "target": "ESNext",
+      "module": "CommonJS",
+      "lib": ["esnext"],
+      "allowJs": true,
+      "outDir": "./build",
+      "rootDir": "./",
+      "esModuleInterop": true,
+      "resolveJsonModule": true,
+      "strictNullChecks": true,
+      "forceConsistentCasingInFileNames": true,
+      "baseUrl": ".",
+      "paths": {
+        "@Libs/*": ["./libs/*"],
+        "@Configs/*": [ "./configs/*" ],
+        "@Models/*": [ "./models/*" ],
+        "@Clusters/*": [ "./clusters/*" ],
+        "@Plata/*": [ "./node_modules/pwi-plata-type/*" ],
+        "@PlataBin/*": [ "./node_modules/pwi-plata-type/bin/*" ],
+      }
     },
     "include": [
         "./**/*.ts",
-        "node_modules/pwi-plata*/**/*.ts"
+        "./node_modules/pwi-plata-type/**/*.ts"
     ]
 }

package/templates/postinstall/lib/_install.mjs

@@ -18,10 +18,10 @@ export async function install({ dirs, projectPackageJson }) {
     promises.push(t.syncFileToProject('tsconfig.json'))
 
     projectPackageJson.type = "module"
-    projectPackageJson.scripts = new Object(null)
-    projectPackageJson.scripts.dev = "ts-node"
+    projectPackageJson.scripts.dev = "ts-node -P ./tsconfig.json"
     projectPackageJson.scripts.postinstall = "node postinstall.js"
-    projectPackageJson.scripts.create = `ts-node --transpile-only --esm ./node_modules/${projectPackageJson.plata_name}/bin/plata-create --`
+    projectPackageJson.scripts.create = `ts-node -P ./tsconfig.json ./node_modules/${projectPackageJson.plata_name}/bin/plata-create --`
+    projectPackageJson.scripts['plata:reload'] = `ts-node -P ./tsconfig.json ./node_modules/${projectPackageJson.plata_name}/bin/plata-reload.ts`
     projectPackageJson.main = undefined
 
     await Promise.all(promises)

package/templates/postinstall/lib/tsconfig.json

@@ -1,16 +1,40 @@
 {
-    "compilerOptions": {
-        "strictNullChecks": true,
-        "module": "es2022",
-        "target": "es2022",
-        "declaration": false,
-        "sourceMap": false,
-        "esModuleInterop": true,
-        "outDir": "build",
-        "moduleResolution": "node"
-    },
-    "include": [
-        "./**/*.ts",
-        "node_modules/pwi-plata*/**/*.ts"
-    ]
+  "ts-node": {
+      "transpileOnly": true,
+      "swc": true,
+      "esm": false,
+      "project": "./tsconfig.json",
+      "skipIgnore": true,
+      "require": [
+        "tsconfig-paths/register"
+      ],
+      "compilerOptions": {
+          "module": "CommonJS"
+      }
+  },
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "CommonJS",
+    "lib": ["esnext"],
+    "allowJs": true,
+    "outDir": "./build",
+    "rootDir": "./",
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "strictNullChecks": true,
+    "forceConsistentCasingInFileNames": true,
+    "baseUrl": ".",
+    "paths": {
+      "@Libs/*": ["./libs/*"],
+      "@Configs/*": [ "./configs/*" ],
+      "@Models/*": [ "./models/*" ],
+      "@Clusters/*": [ "./clusters/*" ],
+      "@Plata/*": [ "./node_modules/pwi-plata-type/*" ],
+      "@PlataBin/*": [ "./node_modules/pwi-plata-type/bin/*" ],
+    }
+  },
+  "include": [
+      "./**/*.ts",
+      "./node_modules/pwi-plata-type/**/*.ts"
+  ]
 }

package/tsconfig.json

@@ -1,16 +1,40 @@
 {
+    "ts-node": {
+        "transpileOnly": true,
+        "swc": true,
+        "esm": false,
+        "project": "./tsconfig.json",
+        "skipIgnore": true,
+        "require": [
+          "tsconfig-paths/register"
+        ],
+        "compilerOptions": {
+            "module": "CommonJS"
+        }
+    },
     "compilerOptions": {
-        "strictNullChecks": true,
-        "module": "es2022",
-        "target": "es2022",
-        "declaration": false,
-        "sourceMap": false,
-        "esModuleInterop": true,
-        "outDir": "build",
-        "moduleResolution": "node"
+      "target": "ESNext",
+      "module": "CommonJS",
+      "lib": ["esnext"],
+      "allowJs": true,
+      "outDir": "./build",
+      "rootDir": "./",
+      "esModuleInterop": true,
+      "resolveJsonModule": true,
+      "strictNullChecks": true,
+      "forceConsistentCasingInFileNames": true,
+      "baseUrl": ".",
+      "paths": {
+        "@libs/*": ["./libs/*"],
+        "@configs/*": [ "./configs/*" ],
+        "@models/*": [ "./models/*" ],
+        "@clusters/*": [ "./clusters/*" ],
+        "@Plata/*": [ "./node_modules/pwi-plata-type/*" ],
+        "@PlataBin/*": [ "./node_modules/pwi-plata-type/bin/*" ],
+      }
     },
     "include": [
         "./**/*.ts",
-        "node_modules/pwi-plata*/**/*.ts"
+        "./node_modules/pwi-plata-type/**/*.ts"
     ]
 }