From 1521fca78f836193ecfe1ea6b4f945fcb82b18c6 Mon Sep 17 00:00:00 2001 From: "Luiz H. R. Silva" Date: Tue, 4 Jun 2024 21:37:51 -0300 Subject: [PATCH 01/76] . --- Documentos/biome.json | 4 +-- package.json | 2 +- pnpm-lock.yaml | 74 +++++++++++++++++++++---------------------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Documentos/biome.json b/Documentos/biome.json index 9ea8a1e..daa0f5f 100644 --- a/Documentos/biome.json +++ b/Documentos/biome.json @@ -1,5 +1,5 @@ { - "$schema": "https://biomejs.dev/schemas/1.7.3/schema.json", + "$schema": "../node_modules/@biomejs/biome/configuration_schema.json", "organizeImports": { "enabled": true }, @@ -44,4 +44,4 @@ "attributePosition": "multiline" } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 0c683d6..289442c 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "zod": "3.23.8" }, "devDependencies": { - "@biomejs/biome": "1.7.3", + "@biomejs/biome": "latest", "@types/node": "^20.12.5" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d33e112..0fc8548 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,63 +16,63 @@ importers: version: 3.23.8 devDependencies: '@biomejs/biome': - specifier: 1.7.3 - version: 1.7.3 + specifier: latest + version: 1.8.0 '@types/node': specifier: ^20.12.5 version: 20.12.5 packages: - '@biomejs/biome@1.7.3': - resolution: {integrity: sha512-ogFQI+fpXftr+tiahA6bIXwZ7CSikygASdqMtH07J2cUzrpjyTMVc9Y97v23c7/tL1xCZhM+W9k4hYIBm7Q6cQ==} + '@biomejs/biome@1.8.0': + resolution: {integrity: sha512-34xcE2z8GWrIz1sCFEmlHT/+4d+SN7YOqqvzlAKXKvaWPRJ2/NUwxPbRsP01P9QODkQ5bvGvc9rpBihmP+7RJQ==} engines: {node: '>=14.21.3'} hasBin: true - '@biomejs/cli-darwin-arm64@1.7.3': - resolution: {integrity: sha512-eDvLQWmGRqrPIRY7AIrkPHkQ3visEItJKkPYSHCscSDdGvKzYjmBJwG1Gu8+QC5ed6R7eiU63LEC0APFBobmfQ==} + '@biomejs/cli-darwin-arm64@1.8.0': + resolution: {integrity: sha512-dBAYzfIJ1JmWigKlWourT3sJ3I60LZPjqNwwlsyFjiv5AV7vPeWlHVVIImV2BpINwNjZQhpXnwDfVnGS4vr7AA==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [darwin] - '@biomejs/cli-darwin-x64@1.7.3': - resolution: {integrity: sha512-JXCaIseKRER7dIURsVlAJacnm8SG5I0RpxZ4ya3dudASYUc68WGl4+FEN03ABY3KMIq7hcK1tzsJiWlmXyosZg==} + '@biomejs/cli-darwin-x64@1.8.0': + resolution: {integrity: sha512-ZTTSD0bP0nn9UpRDGQrQNTILcYSj+IkxTYr3CAV64DWBDtQBomlk2oVKWzDaA1LOhpAsTh0giLCbPJaVk2jfMQ==} engines: {node: '>=14.21.3'} cpu: [x64] os: [darwin] - '@biomejs/cli-linux-arm64-musl@1.7.3': - resolution: {integrity: sha512-c8AlO45PNFZ1BYcwaKzdt46kYbuP6xPGuGQ6h4j3XiEDpyseRRUy/h+6gxj07XovmyxKnSX9GSZ6nVbZvcVUAw==} + '@biomejs/cli-linux-arm64-musl@1.8.0': + resolution: {integrity: sha512-+ee/pZWsvhDv6eRI00krRNSgAg8DKSxzOv3LUsCjto6N1VzqatTASeQv2HRfG1nitf79rRKM75LkMJbqEfiKww==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-arm64@1.7.3': - resolution: {integrity: sha512-phNTBpo7joDFastnmZsFjYcDYobLTx4qR4oPvc9tJ486Bd1SfEVPHEvJdNJrMwUQK56T+TRClOQd/8X1nnjA9w==} + '@biomejs/cli-linux-arm64@1.8.0': + resolution: {integrity: sha512-cx725jTlJS6dskvJJwwCQaaMRBKE2Qss7ukzmx27Rn/DXRxz6tnnBix4FUGPf1uZfwrERkiJlbWM05JWzpvvXg==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-x64-musl@1.7.3': - resolution: {integrity: sha512-UdEHKtYGWEX3eDmVWvQeT+z05T9/Sdt2+F/7zmMOFQ7boANeX8pcO6EkJPK3wxMudrApsNEKT26rzqK6sZRTRA==} + '@biomejs/cli-linux-x64-musl@1.8.0': + resolution: {integrity: sha512-VPA4ocrAOak50VYl8gOAVnjuFFDpIUolShntc/aWM0pZfSIMbRucxnrfUfp44EVwayxjK6ruJTR5xEWj93WvDA==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-linux-x64@1.7.3': - resolution: {integrity: sha512-vnedYcd5p4keT3iD48oSKjOIRPYcjSNNbd8MO1bKo9ajg3GwQXZLAH+0Cvlr+eMsO67/HddWmscSQwTFrC/uPA==} + '@biomejs/cli-linux-x64@1.8.0': + resolution: {integrity: sha512-cmgmhlD4QUxMhL1VdaNqnB81xBHb3R7huVNyYnPYzP+AykZ7XqJbPd1KcWAszNjUk2AHdx0aLKEBwCOWemxb2g==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-win32-arm64@1.7.3': - resolution: {integrity: sha512-unNCDqUKjujYkkSxs7gFIfdasttbDC4+z0kYmcqzRk6yWVoQBL4dNLcCbdnJS+qvVDNdI9rHp2NwpQ0WAdla4Q==} + '@biomejs/cli-win32-arm64@1.8.0': + resolution: {integrity: sha512-J31spvlh39FfRHQacYXxJX9PvTCH/a8+2Jx9D1lxw+LSF0JybqZcw/4JrlFUWUl4kF3yv8AuYUK0sENScc3g9w==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [win32] - '@biomejs/cli-win32-x64@1.7.3': - resolution: {integrity: sha512-ZmByhbrnmz/UUFYB622CECwhKIPjJLLPr5zr3edhu04LzbfcOrz16VYeNq5dpO1ADG70FORhAJkaIGdaVBG00w==} + '@biomejs/cli-win32-x64@1.8.0': + resolution: {integrity: sha512-uPHHvu76JC1zYe9zZDcOU9PAg+1MZmPuNgWkb5jljaDeATvzLFPB+0nuJTilf603LXL+E8IdPQAO61Wy2VuEJA==} engines: {node: '>=14.21.3'} cpu: [x64] os: [win32] @@ -93,39 +93,39 @@ packages: snapshots: - '@biomejs/biome@1.7.3': + '@biomejs/biome@1.8.0': optionalDependencies: - '@biomejs/cli-darwin-arm64': 1.7.3 - '@biomejs/cli-darwin-x64': 1.7.3 - '@biomejs/cli-linux-arm64': 1.7.3 - '@biomejs/cli-linux-arm64-musl': 1.7.3 - '@biomejs/cli-linux-x64': 1.7.3 - '@biomejs/cli-linux-x64-musl': 1.7.3 - '@biomejs/cli-win32-arm64': 1.7.3 - '@biomejs/cli-win32-x64': 1.7.3 + '@biomejs/cli-darwin-arm64': 1.8.0 + '@biomejs/cli-darwin-x64': 1.8.0 + '@biomejs/cli-linux-arm64': 1.8.0 + '@biomejs/cli-linux-arm64-musl': 1.8.0 + '@biomejs/cli-linux-x64': 1.8.0 + '@biomejs/cli-linux-x64-musl': 1.8.0 + '@biomejs/cli-win32-arm64': 1.8.0 + '@biomejs/cli-win32-x64': 1.8.0 - '@biomejs/cli-darwin-arm64@1.7.3': + '@biomejs/cli-darwin-arm64@1.8.0': optional: true - '@biomejs/cli-darwin-x64@1.7.3': + '@biomejs/cli-darwin-x64@1.8.0': optional: true - '@biomejs/cli-linux-arm64-musl@1.7.3': + '@biomejs/cli-linux-arm64-musl@1.8.0': optional: true - '@biomejs/cli-linux-arm64@1.7.3': + '@biomejs/cli-linux-arm64@1.8.0': optional: true - '@biomejs/cli-linux-x64-musl@1.7.3': + '@biomejs/cli-linux-x64-musl@1.8.0': optional: true - '@biomejs/cli-linux-x64@1.7.3': + '@biomejs/cli-linux-x64@1.8.0': optional: true - '@biomejs/cli-win32-arm64@1.7.3': + '@biomejs/cli-win32-arm64@1.8.0': optional: true - '@biomejs/cli-win32-x64@1.7.3': + '@biomejs/cli-win32-x64@1.8.0': optional: true '@types/node@20.12.5': From ac72e915630a0f7750630a24389367141b0e8ae0 Mon Sep 17 00:00:00 2001 From: "Luiz H. R. Silva" Date: Tue, 4 Jun 2024 21:48:26 -0300 Subject: [PATCH 02/76] . --- Documentos/biome.json | 2 +- biome.json | 2 +- package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentos/biome.json b/Documentos/biome.json index daa0f5f..5731ea0 100644 --- a/Documentos/biome.json +++ b/Documentos/biome.json @@ -40,7 +40,7 @@ "arrowParentheses": "always", "enabled": true, "bracketSameLine": false, - "trailingComma": "all", + "trailingCommas": "all", "attributePosition": "multiline" } } diff --git a/biome.json b/biome.json index fa50494..1278ee4 100644 --- a/biome.json +++ b/biome.json @@ -1,5 +1,5 @@ { - "$schema": "https://biomejs.dev/schemas/1.7.3/schema.json", + "$schema": "node_modules/@biomejs/biome/configuration_schema.json", "extends": ["Documentos/biome.json"], "files": { "ignore": [] diff --git a/package.json b/package.json index 289442c..0d01d77 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "p-comuns", - "version": "0.26.0", + "version": "0.29.0", "description": "", "main": "dist/index.js", "scripts": { "build": "rm -rf ./dist && pnpm run biome && npm --no-git-tag-version version minor && tsc", - "biome": "npx @biomejs/biome check --apply ./src" + "biome": "npx @biomejs/biome check --write ./src" }, "author": "", "license": "ISC", From b01ceca6b840e3a30ee85a2dd98015ab0e8f298d Mon Sep 17 00:00:00 2001 From: "Luiz H. R. Silva" Date: Mon, 17 Jun 2024 21:56:03 -0300 Subject: [PATCH 03/76] =?UTF-8?q?movido=20autentica=C3=A7=C3=A3o=20residuo?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/autorizacoes/auntenticacaoResiduos.d.ts | 48 ------------------- dist/autorizacoes/auntenticacaoResiduos.js | 25 ---------- .../autorizacoes/auntenticacaoResiduos.js.map | 1 - dist/autorizacoes/index.d.ts | 2 - dist/autorizacoes/index.js | 19 -------- dist/autorizacoes/index.js.map | 1 - dist/index.d.ts | 1 - dist/index.js | 1 - dist/index.js.map | 2 +- package.json | 10 ++-- src/autorizacoes/auntenticacaoResiduos.ts | 26 ---------- src/autorizacoes/index.ts | 3 -- src/index.ts | 1 - 13 files changed, 8 insertions(+), 132 deletions(-) delete mode 100644 dist/autorizacoes/auntenticacaoResiduos.d.ts delete mode 100644 dist/autorizacoes/auntenticacaoResiduos.js delete mode 100644 dist/autorizacoes/auntenticacaoResiduos.js.map delete mode 100644 dist/autorizacoes/index.d.ts delete mode 100644 dist/autorizacoes/index.js delete mode 100644 dist/autorizacoes/index.js.map delete mode 100644 src/autorizacoes/auntenticacaoResiduos.ts delete mode 100644 src/autorizacoes/index.ts diff --git a/dist/autorizacoes/auntenticacaoResiduos.d.ts b/dist/autorizacoes/auntenticacaoResiduos.d.ts deleted file mode 100644 index 0dc0f98..0000000 --- a/dist/autorizacoes/auntenticacaoResiduos.d.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { z } from "zod"; -export declare const InterfaceAuntenticacao: z.ZodObject<{ - codigo_usuario: z.ZodString; - nome_usuario: z.ZodString; - email_usuario: z.ZodString; - documento_usuario: z.ZodString; - organizacao: z.ZodString; - rotas: z.ZodObject<{}, "strip", z.ZodTypeAny, {}, {}>; - sistema: z.ZodString; - sistema_cor: z.ZodString; - sistema_nome: z.ZodString; - sistema_logo: z.ZodString; - /** as url de integração serão armazenadas pelo sistema resíduos e identificado pelo código do token */ - codigo_token: z.ZodString; - url_usuarios: z.ZodString; - url_empreendedores: z.ZodString; - url_empreendimentos: z.ZodString; -}, "strip", z.ZodTypeAny, { - codigo_usuario?: string; - nome_usuario?: string; - email_usuario?: string; - documento_usuario?: string; - organizacao?: string; - rotas?: {}; - sistema?: string; - sistema_cor?: string; - sistema_nome?: string; - sistema_logo?: string; - codigo_token?: string; - url_usuarios?: string; - url_empreendedores?: string; - url_empreendimentos?: string; -}, { - codigo_usuario?: string; - nome_usuario?: string; - email_usuario?: string; - documento_usuario?: string; - organizacao?: string; - rotas?: {}; - sistema?: string; - sistema_cor?: string; - sistema_nome?: string; - sistema_logo?: string; - codigo_token?: string; - url_usuarios?: string; - url_empreendedores?: string; - url_empreendimentos?: string; -}>; diff --git a/dist/autorizacoes/auntenticacaoResiduos.js b/dist/autorizacoes/auntenticacaoResiduos.js deleted file mode 100644 index 688e688..0000000 --- a/dist/autorizacoes/auntenticacaoResiduos.js +++ /dev/null @@ -1,25 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.InterfaceAuntenticacao = void 0; -const zod_1 = require("zod"); -exports.InterfaceAuntenticacao = zod_1.z.object({ - // usuários - codigo_usuario: zod_1.z.string().uuid(), - nome_usuario: zod_1.z.string(), - email_usuario: zod_1.z.string(), - documento_usuario: zod_1.z.string(), - organizacao: zod_1.z.string(), - rotas: zod_1.z.object({}), - // Dados do sistema - sistema: zod_1.z.string(), - sistema_cor: zod_1.z.string(), - sistema_nome: zod_1.z.string(), - sistema_logo: zod_1.z.string(), - // integrações - /** as url de integração serão armazenadas pelo sistema resíduos e identificado pelo código do token */ - codigo_token: zod_1.z.string(), - url_usuarios: zod_1.z.string().url(), - url_empreendedores: zod_1.z.string().url(), - url_empreendimentos: zod_1.z.string().url(), -}); -//# sourceMappingURL=auntenticacaoResiduos.js.map \ No newline at end of file diff --git a/dist/autorizacoes/auntenticacaoResiduos.js.map b/dist/autorizacoes/auntenticacaoResiduos.js.map deleted file mode 100644 index 93e72fa..0000000 --- a/dist/autorizacoes/auntenticacaoResiduos.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"auntenticacaoResiduos.js","sourceRoot":"","sources":["../../src/autorizacoes/auntenticacaoResiduos.ts"],"names":[],"mappings":";;;AAAA,6BAAuB;AAEV,QAAA,sBAAsB,GAAG,OAAC,CAAC,MAAM,CAAC;IAC7C,WAAW;IAEX,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE;IACjC,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE;IACxB,aAAa,EAAE,OAAC,CAAC,MAAM,EAAE;IACzB,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE;IAC7B,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,KAAK,EAAE,OAAC,CAAC,MAAM,CAAC,EAAE,CAAC;IAEnB,mBAAmB;IACnB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE;IACnB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE;IACxB,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE;IAExB,cAAc;IAEd,uGAAuG;IACvG,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE;IACxB,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IAC9B,kBAAkB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IACpC,mBAAmB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;CACtC,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/autorizacoes/index.d.ts b/dist/autorizacoes/index.d.ts deleted file mode 100644 index d2cb75b..0000000 --- a/dist/autorizacoes/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -/** Sistemas vão conversar por meio de autorizações tipar eles aqui */ -export * from "./auntenticacaoResiduos"; diff --git a/dist/autorizacoes/index.js b/dist/autorizacoes/index.js deleted file mode 100644 index a0b27ec..0000000 --- a/dist/autorizacoes/index.js +++ /dev/null @@ -1,19 +0,0 @@ -"use strict"; -/** Sistemas vão conversar por meio de autorizações tipar eles aqui */ -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - var desc = Object.getOwnPropertyDescriptor(m, k); - if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { - desc = { enumerable: true, get: function() { return m[k]; } }; - } - Object.defineProperty(o, k2, desc); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __exportStar = (this && this.__exportStar) || function(m, exports) { - for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -__exportStar(require("./auntenticacaoResiduos"), exports); -//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/autorizacoes/index.js.map b/dist/autorizacoes/index.js.map deleted file mode 100644 index 5fe8287..0000000 --- a/dist/autorizacoes/index.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/autorizacoes/index.ts"],"names":[],"mappings":";AAAA,sEAAsE;;;;;;;;;;;;;;;;AAEtE,0DAAuC"} \ No newline at end of file diff --git a/dist/index.d.ts b/dist/index.d.ts index 7c8237f..c852da1 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -1,4 +1,3 @@ -export * from "./autorizacoes"; export * from "./constantes"; export * from "./consulta"; export * from "./aleatorio"; diff --git a/dist/index.js b/dist/index.js index c6b5b4e..76cb9f6 100644 --- a/dist/index.js +++ b/dist/index.js @@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) { for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); }; Object.defineProperty(exports, "__esModule", { value: true }); -__exportStar(require("./autorizacoes"), exports); __exportStar(require("./constantes"), exports); __exportStar(require("./consulta"), exports); __exportStar(require("./aleatorio"), exports); diff --git a/dist/index.js.map b/dist/index.js.map index 6cf4810..813178b 100644 --- a/dist/index.js.map +++ b/dist/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA8B;AAC9B,+CAA4B;AAC5B,6CAA0B;AAC1B,8CAA2B;AAC3B,gDAA6B;AAC7B,oDAAiC;AACjC,yCAAsB;AACtB,+CAA4B;AAC5B,+CAA4B"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,6CAA0B;AAC1B,8CAA2B;AAC3B,gDAA6B;AAC7B,oDAAiC;AACjC,yCAAsB;AACtB,+CAA4B;AAC5B,+CAA4B"} \ No newline at end of file diff --git a/package.json b/package.json index 0d01d77..316b836 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,20 @@ { "name": "p-comuns", - "version": "0.29.0", + "version": "0.31.0", "description": "", "main": "dist/index.js", "scripts": { "build": "rm -rf ./dist && pnpm run biome && npm --no-git-tag-version version minor && tsc", "biome": "npx @biomejs/biome check --write ./src" }, - "author": "", + "author": { + "name": "AZTECA SOFTWARE LTDA", + "email": "ti@e-licencie.com.br", + "url": "https://e-licencie.com.br" + }, "license": "ISC", "dependencies": { - "zod": "3.23.8" + "zod": "latest" }, "devDependencies": { "@biomejs/biome": "latest", diff --git a/src/autorizacoes/auntenticacaoResiduos.ts b/src/autorizacoes/auntenticacaoResiduos.ts deleted file mode 100644 index b002238..0000000 --- a/src/autorizacoes/auntenticacaoResiduos.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { z } from "zod" - -export const InterfaceAuntenticacao = z.object({ - // usuários - - codigo_usuario: z.string().uuid(), - nome_usuario: z.string(), - email_usuario: z.string(), - documento_usuario: z.string(), - organizacao: z.string(), - rotas: z.object({}), - - // Dados do sistema - sistema: z.string(), - sistema_cor: z.string(), - sistema_nome: z.string(), - sistema_logo: z.string(), - - // integrações - - /** as url de integração serão armazenadas pelo sistema resíduos e identificado pelo código do token */ - codigo_token: z.string(), - url_usuarios: z.string().url(), - url_empreendedores: z.string().url(), - url_empreendimentos: z.string().url(), -}) diff --git a/src/autorizacoes/index.ts b/src/autorizacoes/index.ts deleted file mode 100644 index 4efe733..0000000 --- a/src/autorizacoes/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -/** Sistemas vão conversar por meio de autorizações tipar eles aqui */ - -export * from "./auntenticacaoResiduos" diff --git a/src/index.ts b/src/index.ts index 6681f07..aff1a92 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,3 @@ -export * from "./autorizacoes" export * from "./constantes" export * from "./consulta" export * from "./aleatorio" From 1813ad10fdf0c1024cca1d399c7cd2902044e38b Mon Sep 17 00:00:00 2001 From: "Luiz H. R. Silva" Date: Wed, 26 Jun 2024 10:55:49 -0300 Subject: [PATCH 04/76] ajuste de libs --- package.json | 4 ++-- pnpm-lock.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 316b836..73948c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.31.0", + "version": "0.32.0", "description": "", "main": "dist/index.js", "scripts": { @@ -21,6 +21,6 @@ "@types/node": "^20.12.5" }, "peerDependencies": { - "typescript": "^5.0.0" + "typescript": "^5" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0fc8548..f4289ba 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,10 +9,10 @@ importers: .: dependencies: typescript: - specifier: ^5.0.0 + specifier: ^5 version: 5.4.4 zod: - specifier: 3.23.8 + specifier: latest version: 3.23.8 devDependencies: '@biomejs/biome': From 9ffdee4bc588bd8c4b3b9f5fbf031bce5448706c Mon Sep 17 00:00:00 2001 From: MarcioJRGodoi Date: Thu, 27 Jun 2024 10:28:24 -0300 Subject: [PATCH 05/76] tipo Usuario residuos --- dist/constantes.d.ts | 4 + dist/constantes.js | 7 +- dist/constantes.js.map | 2 +- package.json | 2 +- pnpm-lock.yaml | 202 ++++++++++++++++++++--------------------- src/constantes.ts | 5 + 6 files changed, 114 insertions(+), 108 deletions(-) diff --git a/dist/constantes.d.ts b/dist/constantes.d.ts index f8284d5..4196023 100644 --- a/dist/constantes.d.ts +++ b/dist/constantes.d.ts @@ -12,3 +12,7 @@ export declare enum camposComuns { export declare enum tx { token = "token" } +export declare enum tipoUsuarioResiduos { + Usuario = "usuario", + Fornecedor = "fornecedor" +} diff --git a/dist/constantes.js b/dist/constantes.js index c9bf5db..00e724b 100644 --- a/dist/constantes.js +++ b/dist/constantes.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.tx = exports.camposComuns = exports.uuid_null = void 0; +exports.tipoUsuarioResiduos = exports.tx = exports.camposComuns = exports.uuid_null = void 0; exports.uuid_null = "00000000-0000-0000-0000-000000000000"; /** Colunas Presentes n maioria das tabelas */ var camposComuns; @@ -17,4 +17,9 @@ var tx; (function (tx) { tx["token"] = "token"; })(tx || (exports.tx = tx = {})); +var tipoUsuarioResiduos; +(function (tipoUsuarioResiduos) { + tipoUsuarioResiduos["Usuario"] = "usuario"; + tipoUsuarioResiduos["Fornecedor"] = "fornecedor"; +})(tipoUsuarioResiduos || (exports.tipoUsuarioResiduos = tipoUsuarioResiduos = {})); //# sourceMappingURL=constantes.js.map \ No newline at end of file diff --git a/dist/constantes.js.map b/dist/constantes.js.map index be775f6..48255b9 100644 --- a/dist/constantes.js.map +++ b/dist/constantes.js.map @@ -1 +1 @@ -{"version":3,"file":"constantes.js","sourceRoot":"","sources":["../src/constantes.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,sCAAsC,CAAA;AAE/D,8CAA8C;AAC9C,IAAY,YAOX;AAPD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,uDAAuC,CAAA;IACvC,+DAA+C,CAAA;IAC/C,iEAAiD,CAAA;IACjD,yEAAyD,CAAA;AAC3D,CAAC,EAPW,YAAY,4BAAZ,YAAY,QAOvB;AAED,gCAAgC;AAChC,IAAY,EAEX;AAFD,WAAY,EAAE;IACZ,qBAAe,CAAA;AACjB,CAAC,EAFW,EAAE,kBAAF,EAAE,QAEb"} \ No newline at end of file +{"version":3,"file":"constantes.js","sourceRoot":"","sources":["../src/constantes.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,sCAAsC,CAAA;AAE/D,8CAA8C;AAC9C,IAAY,YAOX;AAPD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,uDAAuC,CAAA;IACvC,+DAA+C,CAAA;IAC/C,iEAAiD,CAAA;IACjD,yEAAyD,CAAA;AAC3D,CAAC,EAPW,YAAY,4BAAZ,YAAY,QAOvB;AAED,gCAAgC;AAChC,IAAY,EAEX;AAFD,WAAY,EAAE;IACZ,qBAAe,CAAA;AACjB,CAAC,EAFW,EAAE,kBAAF,EAAE,QAEb;AAED,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,0CAAmB,CAAA;IACnB,gDAAyB,CAAA;AAC3B,CAAC,EAHW,mBAAmB,mCAAnB,mBAAmB,QAG9B"} \ No newline at end of file diff --git a/package.json b/package.json index 73948c0..156bc03 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.32.0", + "version": "0.34.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f4289ba..b9de818 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,139 +1,131 @@ -lockfileVersion: '9.0' +lockfileVersion: '6.0' settings: autoInstallPeers: true excludeLinksFromLockfile: false -importers: +dependencies: + typescript: + specifier: ^5 + version: 5.5.2 + zod: + specifier: latest + version: 3.23.8 - .: - dependencies: - typescript: - specifier: ^5 - version: 5.4.4 - zod: - specifier: latest - version: 3.23.8 - devDependencies: - '@biomejs/biome': - specifier: latest - version: 1.8.0 - '@types/node': - specifier: ^20.12.5 - version: 20.12.5 +devDependencies: + '@biomejs/biome': + specifier: latest + version: 1.8.2 + '@types/node': + specifier: ^20.12.5 + version: 20.14.9 packages: - '@biomejs/biome@1.8.0': - resolution: {integrity: sha512-34xcE2z8GWrIz1sCFEmlHT/+4d+SN7YOqqvzlAKXKvaWPRJ2/NUwxPbRsP01P9QODkQ5bvGvc9rpBihmP+7RJQ==} + /@biomejs/biome@1.8.2: + resolution: {integrity: sha512-XafCzLgs0xbH0bCjYKxQ63ig2V86fZQMq1jiy5pyLToWk9aHxA8GAUxyBtklPHtPYZPGEPOYglQHj4jyfUp+Iw==} engines: {node: '>=14.21.3'} hasBin: true - - '@biomejs/cli-darwin-arm64@1.8.0': - resolution: {integrity: sha512-dBAYzfIJ1JmWigKlWourT3sJ3I60LZPjqNwwlsyFjiv5AV7vPeWlHVVIImV2BpINwNjZQhpXnwDfVnGS4vr7AA==} - engines: {node: '>=14.21.3'} - cpu: [arm64] - os: [darwin] - - '@biomejs/cli-darwin-x64@1.8.0': - resolution: {integrity: sha512-ZTTSD0bP0nn9UpRDGQrQNTILcYSj+IkxTYr3CAV64DWBDtQBomlk2oVKWzDaA1LOhpAsTh0giLCbPJaVk2jfMQ==} - engines: {node: '>=14.21.3'} - cpu: [x64] - os: [darwin] - - '@biomejs/cli-linux-arm64-musl@1.8.0': - resolution: {integrity: sha512-+ee/pZWsvhDv6eRI00krRNSgAg8DKSxzOv3LUsCjto6N1VzqatTASeQv2HRfG1nitf79rRKM75LkMJbqEfiKww==} - engines: {node: '>=14.21.3'} - cpu: [arm64] - os: [linux] - - '@biomejs/cli-linux-arm64@1.8.0': - resolution: {integrity: sha512-cx725jTlJS6dskvJJwwCQaaMRBKE2Qss7ukzmx27Rn/DXRxz6tnnBix4FUGPf1uZfwrERkiJlbWM05JWzpvvXg==} - engines: {node: '>=14.21.3'} - cpu: [arm64] - os: [linux] - - '@biomejs/cli-linux-x64-musl@1.8.0': - resolution: {integrity: sha512-VPA4ocrAOak50VYl8gOAVnjuFFDpIUolShntc/aWM0pZfSIMbRucxnrfUfp44EVwayxjK6ruJTR5xEWj93WvDA==} - engines: {node: '>=14.21.3'} - cpu: [x64] - os: [linux] - - '@biomejs/cli-linux-x64@1.8.0': - resolution: {integrity: sha512-cmgmhlD4QUxMhL1VdaNqnB81xBHb3R7huVNyYnPYzP+AykZ7XqJbPd1KcWAszNjUk2AHdx0aLKEBwCOWemxb2g==} - engines: {node: '>=14.21.3'} - cpu: [x64] - os: [linux] - - '@biomejs/cli-win32-arm64@1.8.0': - resolution: {integrity: sha512-J31spvlh39FfRHQacYXxJX9PvTCH/a8+2Jx9D1lxw+LSF0JybqZcw/4JrlFUWUl4kF3yv8AuYUK0sENScc3g9w==} - engines: {node: '>=14.21.3'} - cpu: [arm64] - os: [win32] - - '@biomejs/cli-win32-x64@1.8.0': - resolution: {integrity: sha512-uPHHvu76JC1zYe9zZDcOU9PAg+1MZmPuNgWkb5jljaDeATvzLFPB+0nuJTilf603LXL+E8IdPQAO61Wy2VuEJA==} - engines: {node: '>=14.21.3'} - cpu: [x64] - os: [win32] - - '@types/node@20.12.5': - resolution: {integrity: sha512-BD+BjQ9LS/D8ST9p5uqBxghlN+S42iuNxjsUGjeZobe/ciXzk2qb1B6IXc6AnRLS+yFJRpN2IPEHMzwspfDJNw==} - - typescript@5.4.4: - resolution: {integrity: sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==} - engines: {node: '>=14.17'} - hasBin: true - - undici-types@5.26.5: - resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - - zod@3.23.8: - resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} - -snapshots: - - '@biomejs/biome@1.8.0': + requiresBuild: true optionalDependencies: - '@biomejs/cli-darwin-arm64': 1.8.0 - '@biomejs/cli-darwin-x64': 1.8.0 - '@biomejs/cli-linux-arm64': 1.8.0 - '@biomejs/cli-linux-arm64-musl': 1.8.0 - '@biomejs/cli-linux-x64': 1.8.0 - '@biomejs/cli-linux-x64-musl': 1.8.0 - '@biomejs/cli-win32-arm64': 1.8.0 - '@biomejs/cli-win32-x64': 1.8.0 + '@biomejs/cli-darwin-arm64': 1.8.2 + '@biomejs/cli-darwin-x64': 1.8.2 + '@biomejs/cli-linux-arm64': 1.8.2 + '@biomejs/cli-linux-arm64-musl': 1.8.2 + '@biomejs/cli-linux-x64': 1.8.2 + '@biomejs/cli-linux-x64-musl': 1.8.2 + '@biomejs/cli-win32-arm64': 1.8.2 + '@biomejs/cli-win32-x64': 1.8.2 + dev: true - '@biomejs/cli-darwin-arm64@1.8.0': + /@biomejs/cli-darwin-arm64@1.8.2: + resolution: {integrity: sha512-l9msLsTcSIAPqMsPIhodQmb50sEfaXPLQ0YW4cdj6INmd8iaOh/V9NceQb2366vACTJgcWDQ2RzlvURek1T68g==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-darwin-x64@1.8.0': + /@biomejs/cli-darwin-x64@1.8.2: + resolution: {integrity: sha512-Fc4y/FuIxRSiB3TJ+y27vFDE/HJt4QgBuymktsIKEcBZvnKfsRjxvzVDunccRn4xbKgepnp+fn6BoS+ZIg/I3Q==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-linux-arm64-musl@1.8.0': + /@biomejs/cli-linux-arm64-musl@1.8.2: + resolution: {integrity: sha512-WpT41QJJvkZa1eZq0WmD513zkC6AYaMI39HJKmKeiUeX2NZirG+bxv1YRDhqkns1NbBqo3+qrJqBkPmOW+xAVA==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-linux-arm64@1.8.0': + /@biomejs/cli-linux-arm64@1.8.2: + resolution: {integrity: sha512-Q99qwP0qibkZxm2kfnt37OxeIlliDYf5ogi3zX9ij2DULzc+KtPA9Uj0wCljcJofOBsBYaHc7597Q+Bf/251ww==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-linux-x64-musl@1.8.0': + /@biomejs/cli-linux-x64-musl@1.8.2: + resolution: {integrity: sha512-rk1Wj4d3LIlAlIAS1m2jlyfOjkNbuY1lfwKvWIAeZC51yDMzwhRD7cReE5PE+jqLDtq60PX38hDPeKd7nA1S6A==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-linux-x64@1.8.0': + /@biomejs/cli-linux-x64@1.8.2: + resolution: {integrity: sha512-bjhhUVFchFid2gOjrvBe4fg8BShcpyFQTHuB/QQnfGxs1ddrGP30yq3fHfc6S6MoCcz9Tjd3Zzq1EfWfyy5iHA==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-win32-arm64@1.8.0': + /@biomejs/cli-win32-arm64@1.8.2: + resolution: {integrity: sha512-EUbqmCmNWT5xhnxHrCAEBzJB1AnLqxTYoRjlxiCMzGvsy5jQzhCanJ8CT9kNsApW3pfPWBWkoTa7qrwWmwnEGA==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-win32-x64@1.8.0': + /@biomejs/cli-win32-x64@1.8.2: + resolution: {integrity: sha512-n9H5oRUCk1uNezMgyJh9+hZdtfD8PXLLeq8DUzTycIhl0I1BulIoZ/uxWgRVDFDwAR1JHu1AykISCRFNGnc4iA==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true optional: true - '@types/node@20.12.5': + /@types/node@20.14.9: + resolution: {integrity: sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==} dependencies: undici-types: 5.26.5 + dev: true - typescript@5.4.4: {} + /typescript@5.5.2: + resolution: {integrity: sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==} + engines: {node: '>=14.17'} + hasBin: true + dev: false - undici-types@5.26.5: {} + /undici-types@5.26.5: + resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + dev: true - zod@3.23.8: {} + /zod@3.23.8: + resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} + dev: false diff --git a/src/constantes.ts b/src/constantes.ts index b8f1fd2..6b0555d 100644 --- a/src/constantes.ts +++ b/src/constantes.ts @@ -14,3 +14,8 @@ export enum camposComuns { export enum tx { token = "token", } + +export enum tipoUsuarioResiduos { + Usuario = "usuario", + Fornecedor = "fornecedor", +} From 6456dbd3a9733152d156f57e5dd6e09af40047a8 Mon Sep 17 00:00:00 2001 From: "Luiz H. R. Silva" Date: Fri, 28 Jun 2024 10:03:37 -0300 Subject: [PATCH 06/76] nomeVariavel --- dist/variaveisComuns.d.ts | 10 ++++++++++ dist/variaveisComuns.js | 11 ++++++++++- dist/variaveisComuns.js.map | 2 +- package.json | 2 +- src/variaveisComuns.ts | 9 +++++++++ 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dist/variaveisComuns.d.ts b/dist/variaveisComuns.d.ts index 4af43d4..29c1db8 100644 --- a/dist/variaveisComuns.d.ts +++ b/dist/variaveisComuns.d.ts @@ -1 +1,11 @@ export declare const esperar: (ms: number) => Promise; +/** + * Usado para retronat o no de uma variável, deve ser usado dentro de um objeto + * const nomex = {a: 1, b: 2} + * nomeVariavel({nomex}) // retorna "nomex" + * @param v + * @returns + */ +export declare const nomeVariavel: (v: { + [key: string]: any; +}) => string; diff --git a/dist/variaveisComuns.js b/dist/variaveisComuns.js index 4863508..68ec93c 100644 --- a/dist/variaveisComuns.js +++ b/dist/variaveisComuns.js @@ -1,6 +1,15 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.esperar = void 0; +exports.nomeVariavel = exports.esperar = void 0; const esperar = (ms) => new Promise((resolve) => setTimeout(() => resolve(true), ms)); exports.esperar = esperar; +/** + * Usado para retronat o no de uma variável, deve ser usado dentro de um objeto + * const nomex = {a: 1, b: 2} + * nomeVariavel({nomex}) // retorna "nomex" + * @param v + * @returns + */ +const nomeVariavel = (v) => Object.keys(v).join("/"); +exports.nomeVariavel = nomeVariavel; //# sourceMappingURL=variaveisComuns.js.map \ No newline at end of file diff --git a/dist/variaveisComuns.js.map b/dist/variaveisComuns.js.map index b2aaade..6922273 100644 --- a/dist/variaveisComuns.js.map +++ b/dist/variaveisComuns.js.map @@ -1 +1 @@ -{"version":3,"file":"variaveisComuns.js","sourceRoot":"","sources":["../src/variaveisComuns.ts"],"names":[],"mappings":";;;AAAO,MAAM,OAAO,GAAG,CAAC,EAAU,EAAiB,EAAE,CACnD,IAAI,OAAO,CAAC,CAAC,OAA0B,EAAE,EAAE,CACzC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CACpC,CAAA;AAHU,QAAA,OAAO,WAGjB"} \ No newline at end of file +{"version":3,"file":"variaveisComuns.js","sourceRoot":"","sources":["../src/variaveisComuns.ts"],"names":[],"mappings":";;;AAAO,MAAM,OAAO,GAAG,CAAC,EAAU,EAAiB,EAAE,CACnD,IAAI,OAAO,CAAC,CAAC,OAA0B,EAAE,EAAE,CACzC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CACpC,CAAA;AAHU,QAAA,OAAO,WAGjB;AACH;;;;;;GAMG;AACI,MAAM,YAAY,GAAG,CAAC,CAAyB,EAAE,EAAE,CACxD,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AADb,QAAA,YAAY,gBACC"} \ No newline at end of file diff --git a/package.json b/package.json index 73948c0..9d23030 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.32.0", + "version": "0.33.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/variaveisComuns.ts b/src/variaveisComuns.ts index 51dc267..9128332 100644 --- a/src/variaveisComuns.ts +++ b/src/variaveisComuns.ts @@ -2,3 +2,12 @@ export const esperar = (ms: number): Promise => new Promise((resolve: (r: true) => void) => setTimeout(() => resolve(true), ms), ) +/** + * Usado para retronat o no de uma variável, deve ser usado dentro de um objeto + * const nomex = {a: 1, b: 2} + * nomeVariavel({nomex}) // retorna "nomex" + * @param v + * @returns + */ +export const nomeVariavel = (v: { [key: string]: any }) => + Object.keys(v).join("/") From 60177a29529eb774f80e3b8c32633718cafce0e2 Mon Sep 17 00:00:00 2001 From: "Luiz H. R. Silva" Date: Fri, 28 Jun 2024 10:04:31 -0300 Subject: [PATCH 07/76] build --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f051091..61c0b68 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.34.0", + "version": "0.35.0", "description": "", "main": "dist/index.js", "scripts": { @@ -23,4 +23,4 @@ "peerDependencies": { "typescript": "^5" } -} \ No newline at end of file +} From 87acc3b5622ea385034752ce2f6b40a2fa7defa0 Mon Sep 17 00:00:00 2001 From: "Luiz H. R. Silva" Date: Fri, 28 Jun 2024 10:10:14 -0300 Subject: [PATCH 08/76] build --- dist/index.d.ts | 1 + dist/index.js | 1 + dist/index.js.map | 2 +- package.json | 2 +- pnpm-lock.yaml | 184 ++++++++++++++++++++++++---------------------- src/index.ts | 1 + 6 files changed, 101 insertions(+), 90 deletions(-) diff --git a/dist/index.d.ts b/dist/index.d.ts index c852da1..eea785c 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -6,3 +6,4 @@ export * from "./unidades_medida"; export * from "./uuid"; export * from "./provedores"; export * from "./ecosistema"; +export * from "./variaveisComuns"; diff --git a/dist/index.js b/dist/index.js index 76cb9f6..174dd4b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -22,4 +22,5 @@ __exportStar(require("./unidades_medida"), exports); __exportStar(require("./uuid"), exports); __exportStar(require("./provedores"), exports); __exportStar(require("./ecosistema"), exports); +__exportStar(require("./variaveisComuns"), exports); //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/index.js.map b/dist/index.js.map index 813178b..442bbee 100644 --- a/dist/index.js.map +++ b/dist/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,6CAA0B;AAC1B,8CAA2B;AAC3B,gDAA6B;AAC7B,oDAAiC;AACjC,yCAAsB;AACtB,+CAA4B;AAC5B,+CAA4B"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,6CAA0B;AAC1B,8CAA2B;AAC3B,gDAA6B;AAC7B,oDAAiC;AACjC,yCAAsB;AACtB,+CAA4B;AAC5B,+CAA4B;AAC5B,oDAAiC"} \ No newline at end of file diff --git a/package.json b/package.json index 61c0b68..1e7dcb1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.35.0", + "version": "0.36.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b9de818..5b47c99 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,32 +1,99 @@ -lockfileVersion: '6.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true excludeLinksFromLockfile: false -dependencies: - typescript: - specifier: ^5 - version: 5.5.2 - zod: - specifier: latest - version: 3.23.8 +importers: -devDependencies: - '@biomejs/biome': - specifier: latest - version: 1.8.2 - '@types/node': - specifier: ^20.12.5 - version: 20.14.9 + .: + dependencies: + typescript: + specifier: ^5 + version: 5.5.2 + zod: + specifier: latest + version: 3.23.8 + devDependencies: + '@biomejs/biome': + specifier: latest + version: 1.8.2 + '@types/node': + specifier: ^20.12.5 + version: 20.14.9 packages: - /@biomejs/biome@1.8.2: + '@biomejs/biome@1.8.2': resolution: {integrity: sha512-XafCzLgs0xbH0bCjYKxQ63ig2V86fZQMq1jiy5pyLToWk9aHxA8GAUxyBtklPHtPYZPGEPOYglQHj4jyfUp+Iw==} engines: {node: '>=14.21.3'} hasBin: true - requiresBuild: true + + '@biomejs/cli-darwin-arm64@1.8.2': + resolution: {integrity: sha512-l9msLsTcSIAPqMsPIhodQmb50sEfaXPLQ0YW4cdj6INmd8iaOh/V9NceQb2366vACTJgcWDQ2RzlvURek1T68g==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [darwin] + + '@biomejs/cli-darwin-x64@1.8.2': + resolution: {integrity: sha512-Fc4y/FuIxRSiB3TJ+y27vFDE/HJt4QgBuymktsIKEcBZvnKfsRjxvzVDunccRn4xbKgepnp+fn6BoS+ZIg/I3Q==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [darwin] + + '@biomejs/cli-linux-arm64-musl@1.8.2': + resolution: {integrity: sha512-WpT41QJJvkZa1eZq0WmD513zkC6AYaMI39HJKmKeiUeX2NZirG+bxv1YRDhqkns1NbBqo3+qrJqBkPmOW+xAVA==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [linux] + + '@biomejs/cli-linux-arm64@1.8.2': + resolution: {integrity: sha512-Q99qwP0qibkZxm2kfnt37OxeIlliDYf5ogi3zX9ij2DULzc+KtPA9Uj0wCljcJofOBsBYaHc7597Q+Bf/251ww==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [linux] + + '@biomejs/cli-linux-x64-musl@1.8.2': + resolution: {integrity: sha512-rk1Wj4d3LIlAlIAS1m2jlyfOjkNbuY1lfwKvWIAeZC51yDMzwhRD7cReE5PE+jqLDtq60PX38hDPeKd7nA1S6A==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [linux] + + '@biomejs/cli-linux-x64@1.8.2': + resolution: {integrity: sha512-bjhhUVFchFid2gOjrvBe4fg8BShcpyFQTHuB/QQnfGxs1ddrGP30yq3fHfc6S6MoCcz9Tjd3Zzq1EfWfyy5iHA==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [linux] + + '@biomejs/cli-win32-arm64@1.8.2': + resolution: {integrity: sha512-EUbqmCmNWT5xhnxHrCAEBzJB1AnLqxTYoRjlxiCMzGvsy5jQzhCanJ8CT9kNsApW3pfPWBWkoTa7qrwWmwnEGA==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [win32] + + '@biomejs/cli-win32-x64@1.8.2': + resolution: {integrity: sha512-n9H5oRUCk1uNezMgyJh9+hZdtfD8PXLLeq8DUzTycIhl0I1BulIoZ/uxWgRVDFDwAR1JHu1AykISCRFNGnc4iA==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [win32] + + '@types/node@20.14.9': + resolution: {integrity: sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==} + + typescript@5.5.2: + resolution: {integrity: sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==} + engines: {node: '>=14.17'} + hasBin: true + + undici-types@5.26.5: + resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + + zod@3.23.8: + resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} + +snapshots: + + '@biomejs/biome@1.8.2': optionalDependencies: '@biomejs/cli-darwin-arm64': 1.8.2 '@biomejs/cli-darwin-x64': 1.8.2 @@ -36,96 +103,37 @@ packages: '@biomejs/cli-linux-x64-musl': 1.8.2 '@biomejs/cli-win32-arm64': 1.8.2 '@biomejs/cli-win32-x64': 1.8.2 - dev: true - /@biomejs/cli-darwin-arm64@1.8.2: - resolution: {integrity: sha512-l9msLsTcSIAPqMsPIhodQmb50sEfaXPLQ0YW4cdj6INmd8iaOh/V9NceQb2366vACTJgcWDQ2RzlvURek1T68g==} - engines: {node: '>=14.21.3'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true + '@biomejs/cli-darwin-arm64@1.8.2': optional: true - /@biomejs/cli-darwin-x64@1.8.2: - resolution: {integrity: sha512-Fc4y/FuIxRSiB3TJ+y27vFDE/HJt4QgBuymktsIKEcBZvnKfsRjxvzVDunccRn4xbKgepnp+fn6BoS+ZIg/I3Q==} - engines: {node: '>=14.21.3'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true + '@biomejs/cli-darwin-x64@1.8.2': optional: true - /@biomejs/cli-linux-arm64-musl@1.8.2: - resolution: {integrity: sha512-WpT41QJJvkZa1eZq0WmD513zkC6AYaMI39HJKmKeiUeX2NZirG+bxv1YRDhqkns1NbBqo3+qrJqBkPmOW+xAVA==} - engines: {node: '>=14.21.3'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true + '@biomejs/cli-linux-arm64-musl@1.8.2': optional: true - /@biomejs/cli-linux-arm64@1.8.2: - resolution: {integrity: sha512-Q99qwP0qibkZxm2kfnt37OxeIlliDYf5ogi3zX9ij2DULzc+KtPA9Uj0wCljcJofOBsBYaHc7597Q+Bf/251ww==} - engines: {node: '>=14.21.3'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true + '@biomejs/cli-linux-arm64@1.8.2': optional: true - /@biomejs/cli-linux-x64-musl@1.8.2: - resolution: {integrity: sha512-rk1Wj4d3LIlAlIAS1m2jlyfOjkNbuY1lfwKvWIAeZC51yDMzwhRD7cReE5PE+jqLDtq60PX38hDPeKd7nA1S6A==} - engines: {node: '>=14.21.3'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true + '@biomejs/cli-linux-x64-musl@1.8.2': optional: true - /@biomejs/cli-linux-x64@1.8.2: - resolution: {integrity: sha512-bjhhUVFchFid2gOjrvBe4fg8BShcpyFQTHuB/QQnfGxs1ddrGP30yq3fHfc6S6MoCcz9Tjd3Zzq1EfWfyy5iHA==} - engines: {node: '>=14.21.3'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true + '@biomejs/cli-linux-x64@1.8.2': optional: true - /@biomejs/cli-win32-arm64@1.8.2: - resolution: {integrity: sha512-EUbqmCmNWT5xhnxHrCAEBzJB1AnLqxTYoRjlxiCMzGvsy5jQzhCanJ8CT9kNsApW3pfPWBWkoTa7qrwWmwnEGA==} - engines: {node: '>=14.21.3'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true + '@biomejs/cli-win32-arm64@1.8.2': optional: true - /@biomejs/cli-win32-x64@1.8.2: - resolution: {integrity: sha512-n9H5oRUCk1uNezMgyJh9+hZdtfD8PXLLeq8DUzTycIhl0I1BulIoZ/uxWgRVDFDwAR1JHu1AykISCRFNGnc4iA==} - engines: {node: '>=14.21.3'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true + '@biomejs/cli-win32-x64@1.8.2': optional: true - /@types/node@20.14.9: - resolution: {integrity: sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==} + '@types/node@20.14.9': dependencies: undici-types: 5.26.5 - dev: true - /typescript@5.5.2: - resolution: {integrity: sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==} - engines: {node: '>=14.17'} - hasBin: true - dev: false + typescript@5.5.2: {} - /undici-types@5.26.5: - resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - dev: true + undici-types@5.26.5: {} - /zod@3.23.8: - resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} - dev: false + zod@3.23.8: {} diff --git a/src/index.ts b/src/index.ts index aff1a92..be23d54 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,3 +6,4 @@ export * from "./unidades_medida" export * from "./uuid" export * from "./provedores" export * from "./ecosistema" +export * from "./variaveisComuns" From 6cbf5172b8dafa88a04c08c45f8505dce97164a4 Mon Sep 17 00:00:00 2001 From: "Luiz H. R. Silva" Date: Thu, 11 Jul 2024 09:01:49 -0300 Subject: [PATCH 09/76] build --- Documentos/biome.json | 4 +++- package.json | 4 ++-- pnpm-lock.yaml | 2 +- tsconfig.json | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Documentos/biome.json b/Documentos/biome.json index 5731ea0..0691b52 100644 --- a/Documentos/biome.json +++ b/Documentos/biome.json @@ -22,7 +22,9 @@ "useLiteralKeys": "off" }, "correctness": { - "noEmptyPattern": "off" + "noEmptyPattern": "off", + "noUnusedVariables": "error", + "noUnusedImports": "error" }, "performance": { "noAccumulatingSpread": "off" diff --git a/package.json b/package.json index 1e7dcb1..6a4003b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.36.0", + "version": "0.38.0", "description": "", "main": "dist/index.js", "scripts": { @@ -14,7 +14,7 @@ }, "license": "ISC", "dependencies": { - "zod": "latest" + "zod": "3.23.8" }, "devDependencies": { "@biomejs/biome": "latest", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5b47c99..8d777e4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,7 +12,7 @@ importers: specifier: ^5 version: 5.5.2 zod: - specifier: latest + specifier: 3.23.8 version: 3.23.8 devDependencies: '@biomejs/biome': diff --git a/tsconfig.json b/tsconfig.json index dd7bb1d..3b0d0be 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,7 @@ "outDir": "dist", "esModuleInterop": true, "noImplicitAny": true, - "target": "ESNext", + "target": "ES2020", "jsx": "react", "declaration": true, "declarationDir": "dist", From f6546e33af756cc8d7f303c8f9afbac15f33d19d Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Tue, 16 Jul 2024 15:01:13 -0300 Subject: [PATCH 10/76] noUselessConstructor --- Documentos/biome.json | 5 +++-- package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentos/biome.json b/Documentos/biome.json index 0691b52..4172ca1 100644 --- a/Documentos/biome.json +++ b/Documentos/biome.json @@ -19,7 +19,8 @@ "complexity": { "noBannedTypes": "off", "noForEach": "off", - "useLiteralKeys": "off" + "useLiteralKeys": "off", + "noUselessConstructor": "off" }, "correctness": { "noEmptyPattern": "off", @@ -46,4 +47,4 @@ "attributePosition": "multiline" } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 6a4003b..078fb3d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.38.0", + "version": "0.39.0", "description": "", "main": "dist/index.js", "scripts": { From 8342265bb4801cc84fe6045ad687f8f998f4effe Mon Sep 17 00:00:00 2001 From: MarcioJRGodoi Date: Wed, 17 Jul 2024 16:49:52 -0300 Subject: [PATCH 11/76] incluido versao em camposComuns --- dist/constantes.d.ts | 3 +- dist/constantes.js | 1 + dist/constantes.js.map | 2 +- package.json | 2 +- pnpm-lock.yaml | 184 ++++++++++++++++++++--------------------- src/constantes.ts | 1 + 6 files changed, 94 insertions(+), 99 deletions(-) diff --git a/dist/constantes.d.ts b/dist/constantes.d.ts index 4196023..9ea5e6e 100644 --- a/dist/constantes.d.ts +++ b/dist/constantes.d.ts @@ -6,7 +6,8 @@ export declare enum camposComuns { data_hora_criacao = "data_hora_criacao", data_hora_atualizacao = "data_hora_atualizacao", codigo_usuario_criacao = "codigo_usuario_criacao", - codigo_usuario_atualizacao = "codigo_usuario_atualizacao" + codigo_usuario_atualizacao = "codigo_usuario_atualizacao", + versao = "__versao" } /** Palavras comumente usadas */ export declare enum tx { diff --git a/dist/constantes.js b/dist/constantes.js index 00e724b..53bb10c 100644 --- a/dist/constantes.js +++ b/dist/constantes.js @@ -11,6 +11,7 @@ var camposComuns; camposComuns["data_hora_atualizacao"] = "data_hora_atualizacao"; camposComuns["codigo_usuario_criacao"] = "codigo_usuario_criacao"; camposComuns["codigo_usuario_atualizacao"] = "codigo_usuario_atualizacao"; + camposComuns["versao"] = "__versao"; })(camposComuns || (exports.camposComuns = camposComuns = {})); /** Palavras comumente usadas */ var tx; diff --git a/dist/constantes.js.map b/dist/constantes.js.map index 48255b9..68de555 100644 --- a/dist/constantes.js.map +++ b/dist/constantes.js.map @@ -1 +1 @@ -{"version":3,"file":"constantes.js","sourceRoot":"","sources":["../src/constantes.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,sCAAsC,CAAA;AAE/D,8CAA8C;AAC9C,IAAY,YAOX;AAPD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,uDAAuC,CAAA;IACvC,+DAA+C,CAAA;IAC/C,iEAAiD,CAAA;IACjD,yEAAyD,CAAA;AAC3D,CAAC,EAPW,YAAY,4BAAZ,YAAY,QAOvB;AAED,gCAAgC;AAChC,IAAY,EAEX;AAFD,WAAY,EAAE;IACZ,qBAAe,CAAA;AACjB,CAAC,EAFW,EAAE,kBAAF,EAAE,QAEb;AAED,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,0CAAmB,CAAA;IACnB,gDAAyB,CAAA;AAC3B,CAAC,EAHW,mBAAmB,mCAAnB,mBAAmB,QAG9B"} \ No newline at end of file +{"version":3,"file":"constantes.js","sourceRoot":"","sources":["../src/constantes.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,sCAAsC,CAAA;AAE/D,8CAA8C;AAC9C,IAAY,YAQX;AARD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,uDAAuC,CAAA;IACvC,+DAA+C,CAAA;IAC/C,iEAAiD,CAAA;IACjD,yEAAyD,CAAA;IACzD,mCAAmB,CAAA;AACrB,CAAC,EARW,YAAY,4BAAZ,YAAY,QAQvB;AAED,gCAAgC;AAChC,IAAY,EAEX;AAFD,WAAY,EAAE;IACZ,qBAAe,CAAA;AACjB,CAAC,EAFW,EAAE,kBAAF,EAAE,QAEb;AAED,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,0CAAmB,CAAA;IACnB,gDAAyB,CAAA;AAC3B,CAAC,EAHW,mBAAmB,mCAAnB,mBAAmB,QAG9B"} \ No newline at end of file diff --git a/package.json b/package.json index 078fb3d..53e6fe3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.39.0", + "version": "0.40.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8d777e4..0180b35 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,99 +1,32 @@ -lockfileVersion: '9.0' +lockfileVersion: '6.0' settings: autoInstallPeers: true excludeLinksFromLockfile: false -importers: +dependencies: + typescript: + specifier: ^5 + version: 5.5.2 + zod: + specifier: 3.23.8 + version: 3.23.8 - .: - dependencies: - typescript: - specifier: ^5 - version: 5.5.2 - zod: - specifier: 3.23.8 - version: 3.23.8 - devDependencies: - '@biomejs/biome': - specifier: latest - version: 1.8.2 - '@types/node': - specifier: ^20.12.5 - version: 20.14.9 +devDependencies: + '@biomejs/biome': + specifier: latest + version: 1.8.2 + '@types/node': + specifier: ^20.12.5 + version: 20.14.9 packages: - '@biomejs/biome@1.8.2': + /@biomejs/biome@1.8.2: resolution: {integrity: sha512-XafCzLgs0xbH0bCjYKxQ63ig2V86fZQMq1jiy5pyLToWk9aHxA8GAUxyBtklPHtPYZPGEPOYglQHj4jyfUp+Iw==} engines: {node: '>=14.21.3'} hasBin: true - - '@biomejs/cli-darwin-arm64@1.8.2': - resolution: {integrity: sha512-l9msLsTcSIAPqMsPIhodQmb50sEfaXPLQ0YW4cdj6INmd8iaOh/V9NceQb2366vACTJgcWDQ2RzlvURek1T68g==} - engines: {node: '>=14.21.3'} - cpu: [arm64] - os: [darwin] - - '@biomejs/cli-darwin-x64@1.8.2': - resolution: {integrity: sha512-Fc4y/FuIxRSiB3TJ+y27vFDE/HJt4QgBuymktsIKEcBZvnKfsRjxvzVDunccRn4xbKgepnp+fn6BoS+ZIg/I3Q==} - engines: {node: '>=14.21.3'} - cpu: [x64] - os: [darwin] - - '@biomejs/cli-linux-arm64-musl@1.8.2': - resolution: {integrity: sha512-WpT41QJJvkZa1eZq0WmD513zkC6AYaMI39HJKmKeiUeX2NZirG+bxv1YRDhqkns1NbBqo3+qrJqBkPmOW+xAVA==} - engines: {node: '>=14.21.3'} - cpu: [arm64] - os: [linux] - - '@biomejs/cli-linux-arm64@1.8.2': - resolution: {integrity: sha512-Q99qwP0qibkZxm2kfnt37OxeIlliDYf5ogi3zX9ij2DULzc+KtPA9Uj0wCljcJofOBsBYaHc7597Q+Bf/251ww==} - engines: {node: '>=14.21.3'} - cpu: [arm64] - os: [linux] - - '@biomejs/cli-linux-x64-musl@1.8.2': - resolution: {integrity: sha512-rk1Wj4d3LIlAlIAS1m2jlyfOjkNbuY1lfwKvWIAeZC51yDMzwhRD7cReE5PE+jqLDtq60PX38hDPeKd7nA1S6A==} - engines: {node: '>=14.21.3'} - cpu: [x64] - os: [linux] - - '@biomejs/cli-linux-x64@1.8.2': - resolution: {integrity: sha512-bjhhUVFchFid2gOjrvBe4fg8BShcpyFQTHuB/QQnfGxs1ddrGP30yq3fHfc6S6MoCcz9Tjd3Zzq1EfWfyy5iHA==} - engines: {node: '>=14.21.3'} - cpu: [x64] - os: [linux] - - '@biomejs/cli-win32-arm64@1.8.2': - resolution: {integrity: sha512-EUbqmCmNWT5xhnxHrCAEBzJB1AnLqxTYoRjlxiCMzGvsy5jQzhCanJ8CT9kNsApW3pfPWBWkoTa7qrwWmwnEGA==} - engines: {node: '>=14.21.3'} - cpu: [arm64] - os: [win32] - - '@biomejs/cli-win32-x64@1.8.2': - resolution: {integrity: sha512-n9H5oRUCk1uNezMgyJh9+hZdtfD8PXLLeq8DUzTycIhl0I1BulIoZ/uxWgRVDFDwAR1JHu1AykISCRFNGnc4iA==} - engines: {node: '>=14.21.3'} - cpu: [x64] - os: [win32] - - '@types/node@20.14.9': - resolution: {integrity: sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==} - - typescript@5.5.2: - resolution: {integrity: sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==} - engines: {node: '>=14.17'} - hasBin: true - - undici-types@5.26.5: - resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - - zod@3.23.8: - resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} - -snapshots: - - '@biomejs/biome@1.8.2': + requiresBuild: true optionalDependencies: '@biomejs/cli-darwin-arm64': 1.8.2 '@biomejs/cli-darwin-x64': 1.8.2 @@ -103,37 +36,96 @@ snapshots: '@biomejs/cli-linux-x64-musl': 1.8.2 '@biomejs/cli-win32-arm64': 1.8.2 '@biomejs/cli-win32-x64': 1.8.2 + dev: true - '@biomejs/cli-darwin-arm64@1.8.2': + /@biomejs/cli-darwin-arm64@1.8.2: + resolution: {integrity: sha512-l9msLsTcSIAPqMsPIhodQmb50sEfaXPLQ0YW4cdj6INmd8iaOh/V9NceQb2366vACTJgcWDQ2RzlvURek1T68g==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-darwin-x64@1.8.2': + /@biomejs/cli-darwin-x64@1.8.2: + resolution: {integrity: sha512-Fc4y/FuIxRSiB3TJ+y27vFDE/HJt4QgBuymktsIKEcBZvnKfsRjxvzVDunccRn4xbKgepnp+fn6BoS+ZIg/I3Q==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-linux-arm64-musl@1.8.2': + /@biomejs/cli-linux-arm64-musl@1.8.2: + resolution: {integrity: sha512-WpT41QJJvkZa1eZq0WmD513zkC6AYaMI39HJKmKeiUeX2NZirG+bxv1YRDhqkns1NbBqo3+qrJqBkPmOW+xAVA==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-linux-arm64@1.8.2': + /@biomejs/cli-linux-arm64@1.8.2: + resolution: {integrity: sha512-Q99qwP0qibkZxm2kfnt37OxeIlliDYf5ogi3zX9ij2DULzc+KtPA9Uj0wCljcJofOBsBYaHc7597Q+Bf/251ww==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-linux-x64-musl@1.8.2': + /@biomejs/cli-linux-x64-musl@1.8.2: + resolution: {integrity: sha512-rk1Wj4d3LIlAlIAS1m2jlyfOjkNbuY1lfwKvWIAeZC51yDMzwhRD7cReE5PE+jqLDtq60PX38hDPeKd7nA1S6A==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-linux-x64@1.8.2': + /@biomejs/cli-linux-x64@1.8.2: + resolution: {integrity: sha512-bjhhUVFchFid2gOjrvBe4fg8BShcpyFQTHuB/QQnfGxs1ddrGP30yq3fHfc6S6MoCcz9Tjd3Zzq1EfWfyy5iHA==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-win32-arm64@1.8.2': + /@biomejs/cli-win32-arm64@1.8.2: + resolution: {integrity: sha512-EUbqmCmNWT5xhnxHrCAEBzJB1AnLqxTYoRjlxiCMzGvsy5jQzhCanJ8CT9kNsApW3pfPWBWkoTa7qrwWmwnEGA==} + engines: {node: '>=14.21.3'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true optional: true - '@biomejs/cli-win32-x64@1.8.2': + /@biomejs/cli-win32-x64@1.8.2: + resolution: {integrity: sha512-n9H5oRUCk1uNezMgyJh9+hZdtfD8PXLLeq8DUzTycIhl0I1BulIoZ/uxWgRVDFDwAR1JHu1AykISCRFNGnc4iA==} + engines: {node: '>=14.21.3'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true optional: true - '@types/node@20.14.9': + /@types/node@20.14.9: + resolution: {integrity: sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==} dependencies: undici-types: 5.26.5 + dev: true - typescript@5.5.2: {} + /typescript@5.5.2: + resolution: {integrity: sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==} + engines: {node: '>=14.17'} + hasBin: true + dev: false - undici-types@5.26.5: {} + /undici-types@5.26.5: + resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + dev: true - zod@3.23.8: {} + /zod@3.23.8: + resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} + dev: false diff --git a/src/constantes.ts b/src/constantes.ts index 6b0555d..67b9f65 100644 --- a/src/constantes.ts +++ b/src/constantes.ts @@ -8,6 +8,7 @@ export enum camposComuns { data_hora_atualizacao = "data_hora_atualizacao", codigo_usuario_criacao = "codigo_usuario_criacao", codigo_usuario_atualizacao = "codigo_usuario_atualizacao", + versao = "__versao", } /** Palavras comumente usadas */ From ab7556906a3267af778249408bdd1d38b84e526e Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Fri, 19 Jul 2024 10:52:22 -0300 Subject: [PATCH 12/76] . --- Documentos/biome.json | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentos/biome.json b/Documentos/biome.json index 4172ca1..bd037d6 100644 --- a/Documentos/biome.json +++ b/Documentos/biome.json @@ -20,7 +20,8 @@ "noBannedTypes": "off", "noForEach": "off", "useLiteralKeys": "off", - "noUselessConstructor": "off" + "noUselessConstructor": "off", + "useArrowFunction": "off" }, "correctness": { "noEmptyPattern": "off", diff --git a/package.json b/package.json index 078fb3d..53e6fe3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.39.0", + "version": "0.40.0", "description": "", "main": "dist/index.js", "scripts": { From e1985dd867233b66b2ee98fec2f7cc695fc6311b Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Wed, 11 Sep 2024 10:21:01 -0300 Subject: [PATCH 13/76] =?UTF-8?q?atualiza=C3=A7=C3=A3o=20pnpm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 170 ++++++++++++++++++++++++++----------------------- 2 files changed, 90 insertions(+), 82 deletions(-) diff --git a/package.json b/package.json index 53e6fe3..312ee9d 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,6 @@ "@types/node": "^20.12.5" }, "peerDependencies": { - "typescript": "^5" + "typescript": "5.5.4" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0180b35..b76c18a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,131 +1,139 @@ -lockfileVersion: '6.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true excludeLinksFromLockfile: false -dependencies: - typescript: - specifier: ^5 - version: 5.5.2 - zod: - specifier: 3.23.8 - version: 3.23.8 +importers: -devDependencies: - '@biomejs/biome': - specifier: latest - version: 1.8.2 - '@types/node': - specifier: ^20.12.5 - version: 20.14.9 + .: + dependencies: + typescript: + specifier: 5.5.4 + version: 5.5.4 + zod: + specifier: 3.23.8 + version: 3.23.8 + devDependencies: + '@biomejs/biome': + specifier: latest + version: 1.8.3 + '@types/node': + specifier: ^20.12.5 + version: 20.16.5 packages: - /@biomejs/biome@1.8.2: - resolution: {integrity: sha512-XafCzLgs0xbH0bCjYKxQ63ig2V86fZQMq1jiy5pyLToWk9aHxA8GAUxyBtklPHtPYZPGEPOYglQHj4jyfUp+Iw==} + '@biomejs/biome@1.8.3': + resolution: {integrity: sha512-/uUV3MV+vyAczO+vKrPdOW0Iaet7UnJMU4bNMinggGJTAnBPjCoLEYcyYtYHNnUNYlv4xZMH6hVIQCAozq8d5w==} engines: {node: '>=14.21.3'} hasBin: true - requiresBuild: true - optionalDependencies: - '@biomejs/cli-darwin-arm64': 1.8.2 - '@biomejs/cli-darwin-x64': 1.8.2 - '@biomejs/cli-linux-arm64': 1.8.2 - '@biomejs/cli-linux-arm64-musl': 1.8.2 - '@biomejs/cli-linux-x64': 1.8.2 - '@biomejs/cli-linux-x64-musl': 1.8.2 - '@biomejs/cli-win32-arm64': 1.8.2 - '@biomejs/cli-win32-x64': 1.8.2 - dev: true - /@biomejs/cli-darwin-arm64@1.8.2: - resolution: {integrity: sha512-l9msLsTcSIAPqMsPIhodQmb50sEfaXPLQ0YW4cdj6INmd8iaOh/V9NceQb2366vACTJgcWDQ2RzlvURek1T68g==} + '@biomejs/cli-darwin-arm64@1.8.3': + resolution: {integrity: sha512-9DYOjclFpKrH/m1Oz75SSExR8VKvNSSsLnVIqdnKexj6NwmiMlKk94Wa1kZEdv6MCOHGHgyyoV57Cw8WzL5n3A==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [darwin] - requiresBuild: true - dev: true - optional: true - /@biomejs/cli-darwin-x64@1.8.2: - resolution: {integrity: sha512-Fc4y/FuIxRSiB3TJ+y27vFDE/HJt4QgBuymktsIKEcBZvnKfsRjxvzVDunccRn4xbKgepnp+fn6BoS+ZIg/I3Q==} + '@biomejs/cli-darwin-x64@1.8.3': + resolution: {integrity: sha512-UeW44L/AtbmOF7KXLCoM+9PSgPo0IDcyEUfIoOXYeANaNXXf9mLUwV1GeF2OWjyic5zj6CnAJ9uzk2LT3v/wAw==} engines: {node: '>=14.21.3'} cpu: [x64] os: [darwin] - requiresBuild: true - dev: true - optional: true - /@biomejs/cli-linux-arm64-musl@1.8.2: - resolution: {integrity: sha512-WpT41QJJvkZa1eZq0WmD513zkC6AYaMI39HJKmKeiUeX2NZirG+bxv1YRDhqkns1NbBqo3+qrJqBkPmOW+xAVA==} + '@biomejs/cli-linux-arm64-musl@1.8.3': + resolution: {integrity: sha512-9yjUfOFN7wrYsXt/T/gEWfvVxKlnh3yBpnScw98IF+oOeCYb5/b/+K7YNqKROV2i1DlMjg9g/EcN9wvj+NkMuQ==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@biomejs/cli-linux-arm64@1.8.2: - resolution: {integrity: sha512-Q99qwP0qibkZxm2kfnt37OxeIlliDYf5ogi3zX9ij2DULzc+KtPA9Uj0wCljcJofOBsBYaHc7597Q+Bf/251ww==} + '@biomejs/cli-linux-arm64@1.8.3': + resolution: {integrity: sha512-fed2ji8s+I/m8upWpTJGanqiJ0rnlHOK3DdxsyVLZQ8ClY6qLuPc9uehCREBifRJLl/iJyQpHIRufLDeotsPtw==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@biomejs/cli-linux-x64-musl@1.8.2: - resolution: {integrity: sha512-rk1Wj4d3LIlAlIAS1m2jlyfOjkNbuY1lfwKvWIAeZC51yDMzwhRD7cReE5PE+jqLDtq60PX38hDPeKd7nA1S6A==} + '@biomejs/cli-linux-x64-musl@1.8.3': + resolution: {integrity: sha512-UHrGJX7PrKMKzPGoEsooKC9jXJMa28TUSMjcIlbDnIO4EAavCoVmNQaIuUSH0Ls2mpGMwUIf+aZJv657zfWWjA==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@biomejs/cli-linux-x64@1.8.2: - resolution: {integrity: sha512-bjhhUVFchFid2gOjrvBe4fg8BShcpyFQTHuB/QQnfGxs1ddrGP30yq3fHfc6S6MoCcz9Tjd3Zzq1EfWfyy5iHA==} + '@biomejs/cli-linux-x64@1.8.3': + resolution: {integrity: sha512-I8G2QmuE1teISyT8ie1HXsjFRz9L1m5n83U1O6m30Kw+kPMPSKjag6QGUn+sXT8V+XWIZxFFBoTDEDZW2KPDDw==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@biomejs/cli-win32-arm64@1.8.2: - resolution: {integrity: sha512-EUbqmCmNWT5xhnxHrCAEBzJB1AnLqxTYoRjlxiCMzGvsy5jQzhCanJ8CT9kNsApW3pfPWBWkoTa7qrwWmwnEGA==} + '@biomejs/cli-win32-arm64@1.8.3': + resolution: {integrity: sha512-J+Hu9WvrBevfy06eU1Na0lpc7uR9tibm9maHynLIoAjLZpQU3IW+OKHUtyL8p6/3pT2Ju5t5emReeIS2SAxhkQ==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [win32] - requiresBuild: true - dev: true - optional: true - /@biomejs/cli-win32-x64@1.8.2: - resolution: {integrity: sha512-n9H5oRUCk1uNezMgyJh9+hZdtfD8PXLLeq8DUzTycIhl0I1BulIoZ/uxWgRVDFDwAR1JHu1AykISCRFNGnc4iA==} + '@biomejs/cli-win32-x64@1.8.3': + resolution: {integrity: sha512-/PJ59vA1pnQeKahemaQf4Nyj7IKUvGQSc3Ze1uIGi+Wvr1xF7rGobSrAAG01T/gUDG21vkDsZYM03NAmPiVkqg==} engines: {node: '>=14.21.3'} cpu: [x64] os: [win32] - requiresBuild: true - dev: true - optional: true - /@types/node@20.14.9: - resolution: {integrity: sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==} - dependencies: - undici-types: 5.26.5 - dev: true + '@types/node@20.16.5': + resolution: {integrity: sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==} - /typescript@5.5.2: - resolution: {integrity: sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==} + typescript@5.5.4: + resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==} engines: {node: '>=14.17'} hasBin: true - dev: false - /undici-types@5.26.5: - resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - dev: true + undici-types@6.19.8: + resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} - /zod@3.23.8: + zod@3.23.8: resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} - dev: false + +snapshots: + + '@biomejs/biome@1.8.3': + optionalDependencies: + '@biomejs/cli-darwin-arm64': 1.8.3 + '@biomejs/cli-darwin-x64': 1.8.3 + '@biomejs/cli-linux-arm64': 1.8.3 + '@biomejs/cli-linux-arm64-musl': 1.8.3 + '@biomejs/cli-linux-x64': 1.8.3 + '@biomejs/cli-linux-x64-musl': 1.8.3 + '@biomejs/cli-win32-arm64': 1.8.3 + '@biomejs/cli-win32-x64': 1.8.3 + + '@biomejs/cli-darwin-arm64@1.8.3': + optional: true + + '@biomejs/cli-darwin-x64@1.8.3': + optional: true + + '@biomejs/cli-linux-arm64-musl@1.8.3': + optional: true + + '@biomejs/cli-linux-arm64@1.8.3': + optional: true + + '@biomejs/cli-linux-x64-musl@1.8.3': + optional: true + + '@biomejs/cli-linux-x64@1.8.3': + optional: true + + '@biomejs/cli-win32-arm64@1.8.3': + optional: true + + '@biomejs/cli-win32-x64@1.8.3': + optional: true + + '@types/node@20.16.5': + dependencies: + undici-types: 6.19.8 + + typescript@5.5.4: {} + + undici-types@6.19.8: {} + + zod@3.23.8: {} From a5ca1748afac4e897b5c2a68dc04e395d62d1988 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sun, 15 Sep 2024 09:40:34 -0300 Subject: [PATCH 14/76] adiconado tipagem rota de fornt --- dist/index.d.ts | 1 + dist/index.js | 1 + dist/index.js.map | 2 +- dist/tipagemRotas.d.ts | 38 ++++++++++++++++++++++ dist/tipagemRotas.js | 63 +++++++++++++++++++++++++++++++++++++ dist/tipagemRotas.js.map | 1 + package.json | 2 +- src/index.ts | 1 + src/tipagemRotas.ts | 68 ++++++++++++++++++++++++++++++++++++++++ 9 files changed, 175 insertions(+), 2 deletions(-) create mode 100644 dist/tipagemRotas.d.ts create mode 100644 dist/tipagemRotas.js create mode 100644 dist/tipagemRotas.js.map create mode 100644 src/tipagemRotas.ts diff --git a/dist/index.d.ts b/dist/index.d.ts index eea785c..fbe1588 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -7,3 +7,4 @@ export * from "./uuid"; export * from "./provedores"; export * from "./ecosistema"; export * from "./variaveisComuns"; +export * from "./tipagemRotas"; diff --git a/dist/index.js b/dist/index.js index 174dd4b..d9fe803 100644 --- a/dist/index.js +++ b/dist/index.js @@ -23,4 +23,5 @@ __exportStar(require("./uuid"), exports); __exportStar(require("./provedores"), exports); __exportStar(require("./ecosistema"), exports); __exportStar(require("./variaveisComuns"), exports); +__exportStar(require("./tipagemRotas"), exports); //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/index.js.map b/dist/index.js.map index 442bbee..a48ac43 100644 --- a/dist/index.js.map +++ b/dist/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,6CAA0B;AAC1B,8CAA2B;AAC3B,gDAA6B;AAC7B,oDAAiC;AACjC,yCAAsB;AACtB,+CAA4B;AAC5B,+CAA4B;AAC5B,oDAAiC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,6CAA0B;AAC1B,8CAA2B;AAC3B,gDAA6B;AAC7B,oDAAiC;AACjC,yCAAsB;AACtB,+CAA4B;AAC5B,+CAA4B;AAC5B,oDAAiC;AACjC,iDAA8B"} \ No newline at end of file diff --git a/dist/tipagemRotas.d.ts b/dist/tipagemRotas.d.ts new file mode 100644 index 0000000..a624209 --- /dev/null +++ b/dist/tipagemRotas.d.ts @@ -0,0 +1,38 @@ +/** Gerar uma classe que facilita a gestão de rotas com a tipagem das querys */ +export declare class TipagemRotas { + /** Prefixo da url */ + PREFIXO: string | undefined; + _caminhoParcial: string; + /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial + ** export const mCaminho = new TipagemRotas<{q:string}>("/caminho") + */ + constructor(caminhoParcial: string, PREFIXO: string | undefined); + /** Retorna o caminho completo da rota + ** console.log(mCaminho.caminho) + ** "/caminho" + */ + get caminho(): string; + /** Define o caminho completo da rota + ** mCaminho.caminho = "/novoCaminho" + ** console.log(mCaminho.caminho) + ** "/novoCaminho" + ** */ + set caminho(caminhoParcial: string); + /** Retorna o caminho completo da rota com a query + ** console.log(mCaminho.resolve({q:"query"})) + ** "http://localhost:3000/caminho?q=query" + */ + resolve(query: T): string; + /** Vai para a url + ** mCaminho.ir({q:"query"}) + ** window.location.href = "http://localhost:3000/caminho?q=query" + */ + ir(query: T): void; + /** Retorna os parametros da url + ** console.log(mCaminho.parametros()) + ** {q:"query"} + */ + parametros(): T; +} diff --git a/dist/tipagemRotas.js b/dist/tipagemRotas.js new file mode 100644 index 0000000..432118f --- /dev/null +++ b/dist/tipagemRotas.js @@ -0,0 +1,63 @@ +"use strict"; +/** Gerar uma classe que facilita a gestão de rotas com a tipagem das querys */ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.TipagemRotas = void 0; +class TipagemRotas { + /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial + ** export const mCaminho = new TipagemRotas<{q:string}>("/caminho") + */ + constructor(caminhoParcial, PREFIXO) { + /** Prefixo da url */ + this.PREFIXO = undefined; + this._caminhoParcial = caminhoParcial; + if (PREFIXO) + this.PREFIXO = PREFIXO; + } + /** Retorna o caminho completo da rota + ** console.log(mCaminho.caminho) + ** "/caminho" + */ + get caminho() { + return this.PREFIXO + this._caminhoParcial; + } + /** Define o caminho completo da rota + ** mCaminho.caminho = "/novoCaminho" + ** console.log(mCaminho.caminho) + ** "/novoCaminho" + ** */ + set caminho(caminhoParcial) { + this._caminhoParcial = caminhoParcial; + } + /** Retorna o caminho completo da rota com a query + ** console.log(mCaminho.resolve({q:"query"})) + ** "http://localhost:3000/caminho?q=query" + */ + resolve(query) { + const url = new URL(window.location.href); + url.pathname = this.PREFIXO + this._caminhoParcial; + const queryKeys = typeof query == "object" && query ? Object.entries(query) : [[query, ""]]; + for (const [key, value] of queryKeys) { + url.searchParams.set(String(key), value); + } + return url.href; + } + /** Vai para a url + ** mCaminho.ir({q:"query"}) + ** window.location.href = "http://localhost:3000/caminho?q=query" + */ + ir(query) { + window.location.href = this.resolve(query); + } + /** Retorna os parametros da url + ** console.log(mCaminho.parametros()) + ** {q:"query"} + */ + parametros() { + const url = new URL(window.location.href); + const query = url.searchParams; + const queryObj = Object.fromEntries(query.entries()); + return queryObj; + } +} +exports.TipagemRotas = TipagemRotas; +//# sourceMappingURL=tipagemRotas.js.map \ No newline at end of file diff --git a/dist/tipagemRotas.js.map b/dist/tipagemRotas.js.map new file mode 100644 index 0000000..2abfef2 --- /dev/null +++ b/dist/tipagemRotas.js.map @@ -0,0 +1 @@ +{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":";AAAA,qFAAqF;;;AAErF,MAAa,YAAY;IAKvB;;OAEG;IACH,YAAY,cAAsB,EAAE,OAA2B;QAP/D,qBAAqB;QACrB,YAAO,GAAuB,SAAS,CAAA;QAOrC,IAAI,CAAC,eAAe,GAAG,cAAc,CAAA;QACrC,IAAI,OAAO;YAAE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACrC,CAAC;IAED;;;OAGG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,eAAe,CAAA;IAC5C,CAAC;IACD;;;;UAIM;IACN,IAAI,OAAO,CAAC,cAAsB;QAChC,IAAI,CAAC,eAAe,GAAG,cAAc,CAAA;IACvC,CAAC;IAED;;;OAGG;IAEH,OAAO,CAAC,KAAQ;QACd,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACzC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,eAAe,CAAA;QAClD,MAAM,SAAS,GACb,OAAO,KAAK,IAAI,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAA;QAE3E,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,SAAS,EAAE,CAAC;YACrC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;QAC1C,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,CAAA;IACjB,CAAC;IAED;;;OAGG;IACH,EAAE,CAAC,KAAQ;QACT,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC5C,CAAC;IAED;;;OAGG;IAEH,UAAU;QACR,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACzC,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAA;QAC9B,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QACpD,OAAO,QAAa,CAAA;IACtB,CAAC;CACF;AAjED,oCAiEC"} \ No newline at end of file diff --git a/package.json b/package.json index 312ee9d..20491db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.40.0", + "version": "0.42.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/index.ts b/src/index.ts index be23d54..f4c8d60 100644 --- a/src/index.ts +++ b/src/index.ts @@ -7,3 +7,4 @@ export * from "./uuid" export * from "./provedores" export * from "./ecosistema" export * from "./variaveisComuns" +export * from "./tipagemRotas" diff --git a/src/tipagemRotas.ts b/src/tipagemRotas.ts new file mode 100644 index 0000000..e4fd4f6 --- /dev/null +++ b/src/tipagemRotas.ts @@ -0,0 +1,68 @@ +/** Gerar uma classe que facilita a gestão de rotas com a tipagem das querys */ + +export class TipagemRotas { + /** Prefixo da url */ + PREFIXO: string | undefined = undefined + + _caminhoParcial: string + /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial + ** export const mCaminho = new TipagemRotas<{q:string}>("/caminho") + */ + constructor(caminhoParcial: string, PREFIXO: string | undefined) { + this._caminhoParcial = caminhoParcial + if (PREFIXO) this.PREFIXO = PREFIXO + } + + /** Retorna o caminho completo da rota + ** console.log(mCaminho.caminho) + ** "/caminho" + */ + get caminho() { + return this.PREFIXO + this._caminhoParcial + } + /** Define o caminho completo da rota + ** mCaminho.caminho = "/novoCaminho" + ** console.log(mCaminho.caminho) + ** "/novoCaminho" + ** */ + set caminho(caminhoParcial: string) { + this._caminhoParcial = caminhoParcial + } + + /** Retorna o caminho completo da rota com a query + ** console.log(mCaminho.resolve({q:"query"})) + ** "http://localhost:3000/caminho?q=query" + */ + + resolve(query: T) { + const url = new URL(window.location.href) + url.pathname = this.PREFIXO + this._caminhoParcial + const queryKeys = + typeof query == "object" && query ? Object.entries(query) : [[query, ""]] + + for (const [key, value] of queryKeys) { + url.searchParams.set(String(key), value) + } + return url.href + } + + /** Vai para a url + ** mCaminho.ir({q:"query"}) + ** window.location.href = "http://localhost:3000/caminho?q=query" + */ + ir(query: T) { + window.location.href = this.resolve(query) + } + + /** Retorna os parametros da url + ** console.log(mCaminho.parametros()) + ** {q:"query"} + */ + + parametros() { + const url = new URL(window.location.href) + const query = url.searchParams + const queryObj = Object.fromEntries(query.entries()) + return queryObj as T + } +} From 7971b508c62de6bb9c4feee8c98c8a381bdc6189 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sun, 15 Sep 2024 12:45:30 -0300 Subject: [PATCH 15/76] melhoria de rotas --- dist/tipagemRotas.d.ts | 23 +++++++++++------ dist/tipagemRotas.js | 46 +++++++++++++++++++++++----------- dist/tipagemRotas.js.map | 2 +- package.json | 2 +- src/tipagemRotas.ts | 54 ++++++++++++++++++++++++++++------------ 5 files changed, 86 insertions(+), 41 deletions(-) diff --git a/dist/tipagemRotas.d.ts b/dist/tipagemRotas.d.ts index a624209..cc6c976 100644 --- a/dist/tipagemRotas.d.ts +++ b/dist/tipagemRotas.d.ts @@ -1,14 +1,21 @@ -/** Gerar uma classe que facilita a gestão de rotas com a tipagem das querys */ +/** Gerar uma classe que facilita a gestão de rotas com a tipagem das querys + * + * Definições: + * + * caminho = "/aplicacao/funcionalidade" + * + * endereco = "http://localhost:3000/aplicacao/funcionalidade" + * + * parametros = {nome:"José"} + */ export declare class TipagemRotas { - /** Prefixo da url */ - PREFIXO: string | undefined; - _caminhoParcial: string; + _partesCaminho: string[]; /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial - ** export const mCaminho = new TipagemRotas<{q:string}>("/caminho") + ** export const mCaminho = new TipagemRotas<{q:string}>("aplicacao","funcionalidade") */ - constructor(caminhoParcial: string, PREFIXO: string | undefined); + constructor(...caminhos: string[]); /** Retorna o caminho completo da rota ** console.log(mCaminho.caminho) ** "/caminho" @@ -24,7 +31,7 @@ export declare class TipagemRotas("/caminho") + ** export const mCaminho = new TipagemRotas<{q:string}>("aplicacao","funcionalidade") */ - constructor(caminhoParcial, PREFIXO) { - /** Prefixo da url */ - this.PREFIXO = undefined; - this._caminhoParcial = caminhoParcial; - if (PREFIXO) - this.PREFIXO = PREFIXO; + constructor(...caminhos) { + this._partesCaminho = []; + caminhos.forEach((caminho) => { + String(caminho) + .split("/") + .forEach((parte) => { + if (parte) { + this._partesCaminho.push(parte); + } + }); + }); } /** Retorna o caminho completo da rota ** console.log(mCaminho.caminho) ** "/caminho" */ get caminho() { - return this.PREFIXO + this._caminhoParcial; + return `/${this._partesCaminho.join("/")}`; } /** Define o caminho completo da rota ** mCaminho.caminho = "/novoCaminho" @@ -26,15 +40,15 @@ class TipagemRotas { ** "/novoCaminho" ** */ set caminho(caminhoParcial) { - this._caminhoParcial = caminhoParcial; + this._partesCaminho = caminhoParcial.split("/").filter((parte) => parte); } /** Retorna o caminho completo da rota com a query ** console.log(mCaminho.resolve({q:"query"})) ** "http://localhost:3000/caminho?q=query" */ - resolve(query) { - const url = new URL(window.location.href); - url.pathname = this.PREFIXO + this._caminhoParcial; + endereco(query) { + const url = new URL(typeof window !== "undefined" ? window.location.href : "http://localhost"); + url.pathname = this.caminho; const queryKeys = typeof query == "object" && query ? Object.entries(query) : [[query, ""]]; for (const [key, value] of queryKeys) { url.searchParams.set(String(key), value); @@ -46,14 +60,16 @@ class TipagemRotas { ** window.location.href = "http://localhost:3000/caminho?q=query" */ ir(query) { - window.location.href = this.resolve(query); + if (typeof window != "undefined") { + window.location.href = this.endereco(query); + } } /** Retorna os parametros da url ** console.log(mCaminho.parametros()) ** {q:"query"} */ parametros() { - const url = new URL(window.location.href); + const url = new URL(typeof window !== "undefined" ? window.location.href : "http://localhost"); const query = url.searchParams; const queryObj = Object.fromEntries(query.entries()); return queryObj; diff --git a/dist/tipagemRotas.js.map b/dist/tipagemRotas.js.map index 2abfef2..c2b3a34 100644 --- a/dist/tipagemRotas.js.map +++ b/dist/tipagemRotas.js.map @@ -1 +1 @@ -{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":";AAAA,qFAAqF;;;AAErF,MAAa,YAAY;IAKvB;;OAEG;IACH,YAAY,cAAsB,EAAE,OAA2B;QAP/D,qBAAqB;QACrB,YAAO,GAAuB,SAAS,CAAA;QAOrC,IAAI,CAAC,eAAe,GAAG,cAAc,CAAA;QACrC,IAAI,OAAO;YAAE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACrC,CAAC;IAED;;;OAGG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,eAAe,CAAA;IAC5C,CAAC;IACD;;;;UAIM;IACN,IAAI,OAAO,CAAC,cAAsB;QAChC,IAAI,CAAC,eAAe,GAAG,cAAc,CAAA;IACvC,CAAC;IAED;;;OAGG;IAEH,OAAO,CAAC,KAAQ;QACd,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACzC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,eAAe,CAAA;QAClD,MAAM,SAAS,GACb,OAAO,KAAK,IAAI,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAA;QAE3E,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,SAAS,EAAE,CAAC;YACrC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;QAC1C,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,CAAA;IACjB,CAAC;IAED;;;OAGG;IACH,EAAE,CAAC,KAAQ;QACT,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC5C,CAAC;IAED;;;OAGG;IAEH,UAAU;QACR,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACzC,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAA;QAC9B,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QACpD,OAAO,QAAa,CAAA;IACtB,CAAC;CACF;AAjED,oCAiEC"} \ No newline at end of file +{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAEH,MAAa,YAAY;IAGvB;;OAEG;IACH,YAAY,GAAG,QAAkB;QALjC,mBAAc,GAAa,EAAE,CAAA;QAM3B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,MAAM,CAAC,OAAO,CAAC;iBACZ,KAAK,CAAC,GAAG,CAAC;iBACV,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjB,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACjC,CAAC;YACH,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;OAGG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;IAC5C,CAAC;IACD;;;;UAIM;IACN,IAAI,OAAO,CAAC,cAAsB;QAChC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;IAC1E,CAAC;IAED;;;OAGG;IAEH,QAAQ,CAAC,KAAQ;QACf,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAC1E,CAAA;QAED,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAA;QAE3B,MAAM,SAAS,GACb,OAAO,KAAK,IAAI,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAA;QAE3E,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,SAAS,EAAE,CAAC;YACrC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;QAC1C,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,CAAA;IACjB,CAAC;IAED;;;OAGG;IACH,EAAE,CAAC,KAAQ;QACT,IAAI,OAAO,MAAM,IAAI,WAAW,EAAE,CAAC;YACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;IAED;;;OAGG;IAEH,UAAU;QACR,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAC1E,CAAA;QACD,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAA;QAC9B,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QACpD,OAAO,QAAa,CAAA;IACtB,CAAC;CACF;AA9ED,oCA8EC"} \ No newline at end of file diff --git a/package.json b/package.json index 20491db..06d9d7d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.42.0", + "version": "0.43.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/tipagemRotas.ts b/src/tipagemRotas.ts index e4fd4f6..f4e4632 100644 --- a/src/tipagemRotas.ts +++ b/src/tipagemRotas.ts @@ -1,16 +1,30 @@ -/** Gerar uma classe que facilita a gestão de rotas com a tipagem das querys */ +/** Gerar uma classe que facilita a gestão de rotas com a tipagem das querys + * + * Definições: + * + * caminho = "/aplicacao/funcionalidade" + * + * endereco = "http://localhost:3000/aplicacao/funcionalidade" + * + * parametros = {nome:"José"} + */ -export class TipagemRotas { - /** Prefixo da url */ - PREFIXO: string | undefined = undefined +export class TipagemRotas { + _partesCaminho: string[] = [] - _caminhoParcial: string /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial - ** export const mCaminho = new TipagemRotas<{q:string}>("/caminho") + ** export const mCaminho = new TipagemRotas<{q:string}>("aplicacao","funcionalidade") */ - constructor(caminhoParcial: string, PREFIXO: string | undefined) { - this._caminhoParcial = caminhoParcial - if (PREFIXO) this.PREFIXO = PREFIXO + constructor(...caminhos: string[]) { + caminhos.forEach((caminho) => { + String(caminho) + .split("/") + .forEach((parte) => { + if (parte) { + this._partesCaminho.push(parte) + } + }) + }) } /** Retorna o caminho completo da rota @@ -18,7 +32,7 @@ export class TipagemRotas { ** "/caminho" */ get caminho() { - return this.PREFIXO + this._caminhoParcial + return `/${this._partesCaminho.join("/")}` } /** Define o caminho completo da rota ** mCaminho.caminho = "/novoCaminho" @@ -26,7 +40,7 @@ export class TipagemRotas { ** "/novoCaminho" ** */ set caminho(caminhoParcial: string) { - this._caminhoParcial = caminhoParcial + this._partesCaminho = caminhoParcial.split("/").filter((parte) => parte) } /** Retorna o caminho completo da rota com a query @@ -34,9 +48,13 @@ export class TipagemRotas { ** "http://localhost:3000/caminho?q=query" */ - resolve(query: T) { - const url = new URL(window.location.href) - url.pathname = this.PREFIXO + this._caminhoParcial + endereco(query: T) { + const url = new URL( + typeof window !== "undefined" ? window.location.href : "http://localhost", + ) + + url.pathname = this.caminho + const queryKeys = typeof query == "object" && query ? Object.entries(query) : [[query, ""]] @@ -51,7 +69,9 @@ export class TipagemRotas { ** window.location.href = "http://localhost:3000/caminho?q=query" */ ir(query: T) { - window.location.href = this.resolve(query) + if (typeof window != "undefined") { + window.location.href = this.endereco(query) + } } /** Retorna os parametros da url @@ -60,7 +80,9 @@ export class TipagemRotas { */ parametros() { - const url = new URL(window.location.href) + const url = new URL( + typeof window !== "undefined" ? window.location.href : "http://localhost", + ) const query = url.searchParams const queryObj = Object.fromEntries(query.entries()) return queryObj as T From de77a4c8b6a84e5532b0e6f7b0d817b666d99a6b Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sun, 15 Sep 2024 13:02:33 -0300 Subject: [PATCH 16/76] melhorias --- dist/tipagemRotas.d.ts | 2 +- dist/tipagemRotas.js | 12 +++++++++++- dist/tipagemRotas.js.map | 2 +- package.json | 2 +- src/tipagemRotas.ts | 18 +++++++++++++++++- 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dist/tipagemRotas.d.ts b/dist/tipagemRotas.d.ts index cc6c976..0267412 100644 --- a/dist/tipagemRotas.d.ts +++ b/dist/tipagemRotas.d.ts @@ -31,7 +31,7 @@ export declare class TipagemRotas { ** "http://localhost:3000/caminho?q=query" */ - endereco(query: T) { + endereco(query: T, usarComoHash?: boolean) { const url = new URL( typeof window !== "undefined" ? window.location.href : "http://localhost", ) @@ -61,6 +61,12 @@ export class TipagemRotas { for (const [key, value] of queryKeys) { url.searchParams.set(String(key), value) } + + if (usarComoHash) { + url.hash = `#${url.search}` + url.search = "" + } + return url.href } @@ -85,6 +91,16 @@ export class TipagemRotas { ) const query = url.searchParams const queryObj = Object.fromEntries(query.entries()) + + // pegar hash + const hash = url.hash + if (hash) { + const hashObj = Object.fromEntries( + new URLSearchParams(hash.slice(1)).entries(), + ) + return { ...queryObj, ...hashObj } as T + } + return queryObj as T } } From b08b7de2c09ddfa4a00e8bea74a15e75019846ba Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sun, 15 Sep 2024 13:06:49 -0300 Subject: [PATCH 17/76] melhorias --- dist/tipagemRotas.d.ts | 2 +- dist/tipagemRotas.js | 2 +- dist/tipagemRotas.js.map | 2 +- package.json | 2 +- src/tipagemRotas.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/tipagemRotas.d.ts b/dist/tipagemRotas.d.ts index 0267412..2b0e74c 100644 --- a/dist/tipagemRotas.d.ts +++ b/dist/tipagemRotas.d.ts @@ -41,5 +41,5 @@ export declare class TipagemRotas { ** {q:"query"} */ - parametros() { + get parametros() { const url = new URL( typeof window !== "undefined" ? window.location.href : "http://localhost", ) From 7fae4d43e5fed882e725cc2df512c65261b826cb Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sun, 15 Sep 2024 13:08:19 -0300 Subject: [PATCH 18/76] melhorias --- dist/tipagemRotas.d.ts | 2 +- dist/tipagemRotas.js.map | 2 +- package.json | 2 +- src/tipagemRotas.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/tipagemRotas.d.ts b/dist/tipagemRotas.d.ts index 2b0e74c..0e0079e 100644 --- a/dist/tipagemRotas.d.ts +++ b/dist/tipagemRotas.d.ts @@ -41,5 +41,5 @@ export declare class TipagemRotas; } diff --git a/dist/tipagemRotas.js.map b/dist/tipagemRotas.js.map index c44bdd4..a010434 100644 --- a/dist/tipagemRotas.js.map +++ b/dist/tipagemRotas.js.map @@ -1 +1 @@ -{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 77ad719..9193c00 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.45.0", + "version": "0.46.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/tipagemRotas.ts b/src/tipagemRotas.ts index b7ffd72..7cccc96 100644 --- a/src/tipagemRotas.ts +++ b/src/tipagemRotas.ts @@ -101,6 +101,6 @@ export class TipagemRotas { return { ...queryObj, ...hashObj } as T } - return queryObj as T + return queryObj as Partial } } From 97184ef16974f371543cde57d1332a342ed29c02 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sun, 15 Sep 2024 13:58:38 -0300 Subject: [PATCH 19/76] melhorias --- dist/tipagemRotas.d.ts | 2 +- dist/tipagemRotas.js | 3 ++- dist/tipagemRotas.js.map | 2 +- package.json | 2 +- src/tipagemRotas.ts | 7 ++++--- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dist/tipagemRotas.d.ts b/dist/tipagemRotas.d.ts index 0e0079e..96560a4 100644 --- a/dist/tipagemRotas.d.ts +++ b/dist/tipagemRotas.d.ts @@ -8,7 +8,7 @@ * * parametros = {nome:"José"} */ -export declare class TipagemRotas { _partesCaminho: string[]; diff --git a/dist/tipagemRotas.js b/dist/tipagemRotas.js index 5f442c1..9d1208d 100644 --- a/dist/tipagemRotas.js +++ b/dist/tipagemRotas.js @@ -49,7 +49,8 @@ class TipagemRotas { endereco(query, usarComoHash) { const url = new URL(typeof window !== "undefined" ? window.location.href : "http://localhost"); url.pathname = this.caminho; - const queryKeys = typeof query == "object" && query ? Object.entries(query) : [[query, ""]]; + url.search = ""; + const queryKeys = Object.entries(query); for (const [key, value] of queryKeys) { url.searchParams.set(String(key), value); } diff --git a/dist/tipagemRotas.js.map b/dist/tipagemRotas.js.map index a010434..14bf515 100644 --- a/dist/tipagemRotas.js.map +++ b/dist/tipagemRotas.js.map @@ -1 +1 @@ -{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAEH,MAAa,YAAY;IAGvB;;OAEG;IACH,YAAY,GAAG,QAAkB;QALjC,mBAAc,GAAa,EAAE,CAAA;QAM3B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,MAAM,CAAC,OAAO,CAAC;iBACZ,KAAK,CAAC,GAAG,CAAC;iBACV,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjB,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACjC,CAAC;YACH,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;OAGG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;IAC5C,CAAC;IACD;;;;UAIM;IACN,IAAI,OAAO,CAAC,cAAsB;QAChC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;IAC1E,CAAC;IAED;;;OAGG;IAEH,QAAQ,CAAC,KAAQ,EAAE,YAAsB;QACvC,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAC1E,CAAA;QAED,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAA;QAE3B,GAAG,CAAC,MAAM,GAAG,EAAE,CAAA;QAEf,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAEvC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,SAAS,EAAE,CAAC;YACrC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;QAC1C,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAA;YAC3B,GAAG,CAAC,MAAM,GAAG,EAAE,CAAA;QACjB,CAAC;QAED,OAAO,GAAG,CAAC,IAAI,CAAA;IACjB,CAAC;IAED;;;OAGG;IACH,EAAE,CAAC,KAAQ;QACT,IAAI,OAAO,MAAM,IAAI,WAAW,EAAE,CAAC;YACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;IAED;;;OAGG;IAEH,IAAI,UAAU;QACZ,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAC1E,CAAA;QACD,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAA;QAC9B,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QAEpD,aAAa;QACb,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACrB,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAChC,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAC7C,CAAA;YACD,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,OAAO,EAAO,CAAA;QACzC,CAAC;QAED,OAAO,QAAsB,CAAA;IAC/B,CAAC;CACF;AA/FD,oCA+FC"} \ No newline at end of file diff --git a/package.json b/package.json index 9193c00..232797f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.46.0", + "version": "0.47.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/tipagemRotas.ts b/src/tipagemRotas.ts index 7cccc96..c084d74 100644 --- a/src/tipagemRotas.ts +++ b/src/tipagemRotas.ts @@ -9,7 +9,7 @@ * parametros = {nome:"José"} */ -export class TipagemRotas { +export class TipagemRotas { _partesCaminho: string[] = [] /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial @@ -55,8 +55,9 @@ export class TipagemRotas { url.pathname = this.caminho - const queryKeys = - typeof query == "object" && query ? Object.entries(query) : [[query, ""]] + url.search = "" + + const queryKeys = Object.entries(query) for (const [key, value] of queryKeys) { url.searchParams.set(String(key), value) From f06f666cb4bd85f3e1c6a07e966fa487c79b635a Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 16 Sep 2024 18:16:42 -0300 Subject: [PATCH 20/76] =?UTF-8?q?feat:=20adc=20exten=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/extensoes.d.ts | 5 ++ dist/extensoes.js | 156 ++++++++++++++++++++++++++++++++++++++++++ dist/extensoes.js.map | 1 + dist/index.d.ts | 1 + dist/index.js | 1 + dist/index.js.map | 2 +- package.json | 2 +- src/extensoes.ts | 156 ++++++++++++++++++++++++++++++++++++++++++ src/index.ts | 1 + 9 files changed, 323 insertions(+), 2 deletions(-) create mode 100644 dist/extensoes.d.ts create mode 100644 dist/extensoes.js create mode 100644 dist/extensoes.js.map create mode 100644 src/extensoes.ts diff --git a/dist/extensoes.d.ts b/dist/extensoes.d.ts new file mode 100644 index 0000000..405e03b --- /dev/null +++ b/dist/extensoes.d.ts @@ -0,0 +1,5 @@ +export declare const extensoes: { + ext: string; + tipo: string; + mime: string; +}[]; diff --git a/dist/extensoes.js b/dist/extensoes.js new file mode 100644 index 0000000..5f0e563 --- /dev/null +++ b/dist/extensoes.js @@ -0,0 +1,156 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.extensoes = void 0; +exports.extensoes = [ + { + ext: "gif", + tipo: "imagem", + mime: "image/gif", + }, + { + ext: "jpg", + tipo: "imagem", + mime: "image/jpeg", + }, + { + ext: "jpeg", + tipo: "imagem", + mime: "image/jpeg", + }, + { + ext: "png", + tipo: "imagem", + mime: "image/png", + }, + { + ext: "bmp", + tipo: "imagem", + mime: "image/bmp", + }, + { + ext: "webp", + tipo: "imagem", + mime: "image/webp", + }, + { + ext: "tiff", + tipo: "imagem", + mime: "image/tiff", + }, + { + ext: "svg", + tipo: "imagem", + mime: "image/svg+xml", + }, + { + ext: "ico", + tipo: "imagem", + mime: "image/x-icon", + }, + { + ext: "pdf", + tipo: "documento", + mime: "application/pdf", + }, + { + ext: "doc", + tipo: "documento", + mime: "application/msword", + }, + { + ext: "docx", + tipo: "documento", + mime: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", + }, + { + ext: "xls", + tipo: "documento", + mime: "application/vnd.ms-excel", + }, + { + ext: "xlsx", + tipo: "documento", + mime: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + }, + { + ext: "ppt", + tipo: "documento", + mime: "application/vnd.ms-powerpoint", + }, + { + ext: "pptx", + tipo: "documento", + mime: "application/vnd.openxmlformats-officedocument.presentationml.presentation", + }, + { + ext: "txt", + tipo: "documento", + mime: "text/plain", + }, + { + ext: "odt", + tipo: "documento", + mime: "application/vnd.oasis.opendocument.text", + }, + { + ext: "ods", + tipo: "documento", + mime: "application/vnd.oasis.opendocument.spreadsheet", + }, + { + ext: "rtf", + tipo: "documento", + mime: "application/rtf", + }, + { + ext: "csv", + tipo: "documento", + mime: "text/csv", + }, + { + ext: "mp4", + tipo: "vídeo", + mime: "video/mp4", + }, + { + ext: "avi", + tipo: "vídeo", + mime: "video/x-msvideo", + }, + { + ext: "mkv", + tipo: "vídeo", + mime: "video/x-matroska", + }, + { + ext: "mov", + tipo: "vídeo", + mime: "video/quicktime", + }, + { + ext: "wmv", + tipo: "vídeo", + mime: "video/x-ms-wmv", + }, + { + ext: "flv", + tipo: "vídeo", + mime: "video/x-flv", + }, + { + ext: "webm", + tipo: "vídeo", + mime: "video/webm", + }, + { + ext: "3gp", + tipo: "vídeo", + mime: "video/3gpp", + }, + { + ext: "mpeg", + tipo: "vídeo", + mime: "video/mpeg", + }, +]; +//# sourceMappingURL=extensoes.js.map \ No newline at end of file diff --git a/dist/extensoes.js.map b/dist/extensoes.js.map new file mode 100644 index 0000000..8d941b4 --- /dev/null +++ b/dist/extensoes.js.map @@ -0,0 +1 @@ +{"version":3,"file":"extensoes.js","sourceRoot":"","sources":["../src/extensoes.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/index.d.ts b/dist/index.d.ts index fbe1588..29c518b 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -8,3 +8,4 @@ export * from "./provedores"; export * from "./ecosistema"; export * from "./variaveisComuns"; export * from "./tipagemRotas"; +export * from "./extensoes"; diff --git a/dist/index.js b/dist/index.js index d9fe803..ab35209 100644 --- a/dist/index.js +++ b/dist/index.js @@ -24,4 +24,5 @@ __exportStar(require("./provedores"), exports); __exportStar(require("./ecosistema"), exports); __exportStar(require("./variaveisComuns"), exports); __exportStar(require("./tipagemRotas"), exports); +__exportStar(require("./extensoes"), exports); //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/index.js.map b/dist/index.js.map index a48ac43..b2ebbfc 100644 --- a/dist/index.js.map +++ b/dist/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,6CAA0B;AAC1B,8CAA2B;AAC3B,gDAA6B;AAC7B,oDAAiC;AACjC,yCAAsB;AACtB,+CAA4B;AAC5B,+CAA4B;AAC5B,oDAAiC;AACjC,iDAA8B"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,6CAA0B;AAC1B,8CAA2B;AAC3B,gDAA6B;AAC7B,oDAAiC;AACjC,yCAAsB;AACtB,+CAA4B;AAC5B,+CAA4B;AAC5B,oDAAiC;AACjC,iDAA8B;AAC9B,8CAA2B"} \ No newline at end of file diff --git a/package.json b/package.json index 232797f..8059d3f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.47.0", + "version": "0.48.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/extensoes.ts b/src/extensoes.ts new file mode 100644 index 0000000..59602a2 --- /dev/null +++ b/src/extensoes.ts @@ -0,0 +1,156 @@ +export const extensoes: { + ext: string + tipo: string + mime: string +}[] = [ + { + ext: "gif", + tipo: "imagem", + mime: "image/gif", + }, + { + ext: "jpg", + tipo: "imagem", + mime: "image/jpeg", + }, + { + ext: "jpeg", + tipo: "imagem", + mime: "image/jpeg", + }, + { + ext: "png", + tipo: "imagem", + mime: "image/png", + }, + { + ext: "bmp", + tipo: "imagem", + mime: "image/bmp", + }, + { + ext: "webp", + tipo: "imagem", + mime: "image/webp", + }, + { + ext: "tiff", + tipo: "imagem", + mime: "image/tiff", + }, + { + ext: "svg", + tipo: "imagem", + mime: "image/svg+xml", + }, + { + ext: "ico", + tipo: "imagem", + mime: "image/x-icon", + }, + { + ext: "pdf", + tipo: "documento", + mime: "application/pdf", + }, + { + ext: "doc", + tipo: "documento", + mime: "application/msword", + }, + { + ext: "docx", + tipo: "documento", + mime: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", + }, + { + ext: "xls", + tipo: "documento", + mime: "application/vnd.ms-excel", + }, + { + ext: "xlsx", + tipo: "documento", + mime: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + }, + { + ext: "ppt", + tipo: "documento", + mime: "application/vnd.ms-powerpoint", + }, + { + ext: "pptx", + tipo: "documento", + mime: "application/vnd.openxmlformats-officedocument.presentationml.presentation", + }, + { + ext: "txt", + tipo: "documento", + mime: "text/plain", + }, + { + ext: "odt", + tipo: "documento", + mime: "application/vnd.oasis.opendocument.text", + }, + { + ext: "ods", + tipo: "documento", + mime: "application/vnd.oasis.opendocument.spreadsheet", + }, + { + ext: "rtf", + tipo: "documento", + mime: "application/rtf", + }, + { + ext: "csv", + tipo: "documento", + mime: "text/csv", + }, + { + ext: "mp4", + tipo: "vídeo", + mime: "video/mp4", + }, + { + ext: "avi", + tipo: "vídeo", + mime: "video/x-msvideo", + }, + { + ext: "mkv", + tipo: "vídeo", + mime: "video/x-matroska", + }, + { + ext: "mov", + tipo: "vídeo", + mime: "video/quicktime", + }, + { + ext: "wmv", + tipo: "vídeo", + mime: "video/x-ms-wmv", + }, + { + ext: "flv", + tipo: "vídeo", + mime: "video/x-flv", + }, + { + ext: "webm", + tipo: "vídeo", + mime: "video/webm", + }, + { + ext: "3gp", + tipo: "vídeo", + mime: "video/3gpp", + }, + { + ext: "mpeg", + tipo: "vídeo", + mime: "video/mpeg", + }, +] diff --git a/src/index.ts b/src/index.ts index f4c8d60..f8d7453 100644 --- a/src/index.ts +++ b/src/index.ts @@ -8,3 +8,4 @@ export * from "./provedores" export * from "./ecosistema" export * from "./variaveisComuns" export * from "./tipagemRotas" +export * from "./extensoes" From e87d0a0239f688d70a4caf0997565dc16c36d190 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 16 Sep 2024 18:21:46 -0300 Subject: [PATCH 21/76] build --- dist/extensoes.d.ts | 2 +- package.json | 2 +- src/extensoes.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/extensoes.d.ts b/dist/extensoes.d.ts index 405e03b..65a728e 100644 --- a/dist/extensoes.d.ts +++ b/dist/extensoes.d.ts @@ -1,5 +1,5 @@ export declare const extensoes: { ext: string; - tipo: string; + tipo: "imagem" | "documento" | "vídeo"; mime: string; }[]; diff --git a/package.json b/package.json index 8059d3f..2643777 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.48.0", + "version": "0.49.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/extensoes.ts b/src/extensoes.ts index 59602a2..1aef8e0 100644 --- a/src/extensoes.ts +++ b/src/extensoes.ts @@ -1,6 +1,6 @@ export const extensoes: { ext: string - tipo: string + tipo: "imagem" | "documento" | "vídeo" mime: string }[] = [ { From eae585645d8548727ac6795dfb3a814632a576fb Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 16 Sep 2024 19:53:13 -0300 Subject: [PATCH 22/76] tipoArquivo --- dist/extensoes.d.ts | 10 +++++++++- dist/extensoes.js | 19 ++++++++++++++++++- dist/extensoes.js.map | 2 +- package.json | 2 +- src/extensoes.ts | 23 ++++++++++++++++++++++- 5 files changed, 51 insertions(+), 5 deletions(-) diff --git a/dist/extensoes.d.ts b/dist/extensoes.d.ts index 65a728e..76b648c 100644 --- a/dist/extensoes.d.ts +++ b/dist/extensoes.d.ts @@ -1,5 +1,13 @@ +type tiposArquivo = "imagem" | "documento" | "vídeo" | "outros"; export declare const extensoes: { ext: string; - tipo: "imagem" | "documento" | "vídeo"; + tipo: tiposArquivo; mime: string; }[]; +/** + * Função que retorna o tipo do arquivo + * @param nomeArquivo + * @returns + */ +export declare const tipoArquivo: (nomeArquivo: string | null | undefined) => tiposArquivo; +export {}; diff --git a/dist/extensoes.js b/dist/extensoes.js index 5f0e563..32f6820 100644 --- a/dist/extensoes.js +++ b/dist/extensoes.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.extensoes = void 0; +exports.tipoArquivo = exports.extensoes = void 0; exports.extensoes = [ { ext: "gif", @@ -153,4 +153,21 @@ exports.extensoes = [ mime: "video/mpeg", }, ]; +/** + * Função que retorna o tipo do arquivo + * @param nomeArquivo + * @returns + */ +const tipoArquivo = (nomeArquivo) => { + // extenssão do arquivo + const extArquivo = String(nomeArquivo || "") + .toLocaleLowerCase() + .split(".") + .pop(); + // procura a extensão do arquivo na lista de extensões + const extensao = exports.extensoes.find((extensao) => extensao.ext === extArquivo); + // retorna o tipo do arquivo + return extensao?.tipo || "outros"; +}; +exports.tipoArquivo = tipoArquivo; //# sourceMappingURL=extensoes.js.map \ No newline at end of file diff --git a/dist/extensoes.js.map b/dist/extensoes.js.map index 8d941b4..8aa2abd 100644 --- a/dist/extensoes.js.map +++ b/dist/extensoes.js.map @@ -1 +1 @@ -{"version":3,"file":"extensoes.js","sourceRoot":"","sources":["../src/extensoes.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"extensoes.js","sourceRoot":"","sources":["../src/extensoes.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 2643777..bb9dd6e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.49.0", + "version": "0.50.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/extensoes.ts b/src/extensoes.ts index 1aef8e0..b321977 100644 --- a/src/extensoes.ts +++ b/src/extensoes.ts @@ -1,6 +1,8 @@ +type tiposArquivo = "imagem" | "documento" | "vídeo" | "outros" + export const extensoes: { ext: string - tipo: "imagem" | "documento" | "vídeo" + tipo: tiposArquivo mime: string }[] = [ { @@ -154,3 +156,22 @@ export const extensoes: { mime: "video/mpeg", }, ] + +/** + * Função que retorna o tipo do arquivo + * @param nomeArquivo + * @returns + */ +export const tipoArquivo = ( + nomeArquivo: string | null | undefined, +): tiposArquivo => { + // extenssão do arquivo + const extArquivo = String(nomeArquivo || "") + .toLocaleLowerCase() + .split(".") + .pop() + // procura a extensão do arquivo na lista de extensões + const extensao = extensoes.find((extensao) => extensao.ext === extArquivo) + // retorna o tipo do arquivo + return extensao?.tipo || "outros" +} From b89fb74c8f13eef012ebf8b016b12d61a2ce454b Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sun, 29 Sep 2024 12:53:09 -0300 Subject: [PATCH 23/76] pacotes --- package.json | 6 ++-- pnpm-lock.yaml | 92 +++++++++++++++++++++++++------------------------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index bb9dd6e..7215604 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.50.0", + "version": "0.51.0", "description": "", "main": "dist/index.js", "scripts": { @@ -18,9 +18,9 @@ }, "devDependencies": { "@biomejs/biome": "latest", - "@types/node": "^20.12.5" + "@types/node": "^20.16.10" }, "peerDependencies": { - "typescript": "5.5.4" + "typescript": "5.6.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b76c18a..5237f60 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,79 +9,79 @@ importers: .: dependencies: typescript: - specifier: 5.5.4 - version: 5.5.4 + specifier: 5.6.2 + version: 5.6.2 zod: specifier: 3.23.8 version: 3.23.8 devDependencies: '@biomejs/biome': specifier: latest - version: 1.8.3 + version: 1.9.2 '@types/node': - specifier: ^20.12.5 - version: 20.16.5 + specifier: ^20.16.10 + version: 20.16.10 packages: - '@biomejs/biome@1.8.3': - resolution: {integrity: sha512-/uUV3MV+vyAczO+vKrPdOW0Iaet7UnJMU4bNMinggGJTAnBPjCoLEYcyYtYHNnUNYlv4xZMH6hVIQCAozq8d5w==} + '@biomejs/biome@1.9.2': + resolution: {integrity: sha512-4j2Gfwft8Jqp1X0qLYvK4TEy4xhTo4o6rlvJPsjPeEame8gsmbGQfOPBkw7ur+7/Z/f0HZmCZKqbMvR7vTXQYQ==} engines: {node: '>=14.21.3'} hasBin: true - '@biomejs/cli-darwin-arm64@1.8.3': - resolution: {integrity: sha512-9DYOjclFpKrH/m1Oz75SSExR8VKvNSSsLnVIqdnKexj6NwmiMlKk94Wa1kZEdv6MCOHGHgyyoV57Cw8WzL5n3A==} + '@biomejs/cli-darwin-arm64@1.9.2': + resolution: {integrity: sha512-rbs9uJHFmhqB3Td0Ro+1wmeZOHhAPTL3WHr8NtaVczUmDhXkRDWScaxicG9+vhSLj1iLrW47itiK6xiIJy6vaA==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [darwin] - '@biomejs/cli-darwin-x64@1.8.3': - resolution: {integrity: sha512-UeW44L/AtbmOF7KXLCoM+9PSgPo0IDcyEUfIoOXYeANaNXXf9mLUwV1GeF2OWjyic5zj6CnAJ9uzk2LT3v/wAw==} + '@biomejs/cli-darwin-x64@1.9.2': + resolution: {integrity: sha512-BlfULKijNaMigQ9GH9fqJVt+3JTDOSiZeWOQtG/1S1sa8Lp046JHG3wRJVOvekTPL9q/CNFW1NVG8J0JN+L1OA==} engines: {node: '>=14.21.3'} cpu: [x64] os: [darwin] - '@biomejs/cli-linux-arm64-musl@1.8.3': - resolution: {integrity: sha512-9yjUfOFN7wrYsXt/T/gEWfvVxKlnh3yBpnScw98IF+oOeCYb5/b/+K7YNqKROV2i1DlMjg9g/EcN9wvj+NkMuQ==} + '@biomejs/cli-linux-arm64-musl@1.9.2': + resolution: {integrity: sha512-ZATvbUWhNxegSALUnCKWqetTZqrK72r2RsFD19OK5jXDj/7o1hzI1KzDNG78LloZxftrwr3uI9SqCLh06shSZw==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-arm64@1.8.3': - resolution: {integrity: sha512-fed2ji8s+I/m8upWpTJGanqiJ0rnlHOK3DdxsyVLZQ8ClY6qLuPc9uehCREBifRJLl/iJyQpHIRufLDeotsPtw==} + '@biomejs/cli-linux-arm64@1.9.2': + resolution: {integrity: sha512-T8TJuSxuBDeQCQzxZu2o3OU4eyLumTofhCxxFd3+aH2AEWVMnH7Z/c3QP1lHI5RRMBP9xIJeMORqDQ5j+gVZzw==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-x64-musl@1.8.3': - resolution: {integrity: sha512-UHrGJX7PrKMKzPGoEsooKC9jXJMa28TUSMjcIlbDnIO4EAavCoVmNQaIuUSH0Ls2mpGMwUIf+aZJv657zfWWjA==} + '@biomejs/cli-linux-x64-musl@1.9.2': + resolution: {integrity: sha512-CjPM6jT1miV5pry9C7qv8YJk0FIZvZd86QRD3atvDgfgeh9WQU0k2Aoo0xUcPdTnoz0WNwRtDicHxwik63MmSg==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-linux-x64@1.8.3': - resolution: {integrity: sha512-I8G2QmuE1teISyT8ie1HXsjFRz9L1m5n83U1O6m30Kw+kPMPSKjag6QGUn+sXT8V+XWIZxFFBoTDEDZW2KPDDw==} + '@biomejs/cli-linux-x64@1.9.2': + resolution: {integrity: sha512-T0cPk3C3Jr2pVlsuQVTBqk2qPjTm8cYcTD9p/wmR9MeVqui1C/xTVfOIwd3miRODFMrJaVQ8MYSXnVIhV9jTjg==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-win32-arm64@1.8.3': - resolution: {integrity: sha512-J+Hu9WvrBevfy06eU1Na0lpc7uR9tibm9maHynLIoAjLZpQU3IW+OKHUtyL8p6/3pT2Ju5t5emReeIS2SAxhkQ==} + '@biomejs/cli-win32-arm64@1.9.2': + resolution: {integrity: sha512-2x7gSty75bNIeD23ZRPXyox6Z/V0M71ObeJtvQBhi1fgrvPdtkEuw7/0wEHg6buNCubzOFuN9WYJm6FKoUHfhg==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [win32] - '@biomejs/cli-win32-x64@1.8.3': - resolution: {integrity: sha512-/PJ59vA1pnQeKahemaQf4Nyj7IKUvGQSc3Ze1uIGi+Wvr1xF7rGobSrAAG01T/gUDG21vkDsZYM03NAmPiVkqg==} + '@biomejs/cli-win32-x64@1.9.2': + resolution: {integrity: sha512-JC3XvdYcjmu1FmAehVwVV0SebLpeNTnO2ZaMdGCSOdS7f8O9Fq14T2P1gTG1Q29Q8Dt1S03hh0IdVpIZykOL8g==} engines: {node: '>=14.21.3'} cpu: [x64] os: [win32] - '@types/node@20.16.5': - resolution: {integrity: sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==} + '@types/node@20.16.10': + resolution: {integrity: sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==} - typescript@5.5.4: - resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==} + typescript@5.6.2: + resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} engines: {node: '>=14.17'} hasBin: true @@ -93,46 +93,46 @@ packages: snapshots: - '@biomejs/biome@1.8.3': + '@biomejs/biome@1.9.2': optionalDependencies: - '@biomejs/cli-darwin-arm64': 1.8.3 - '@biomejs/cli-darwin-x64': 1.8.3 - '@biomejs/cli-linux-arm64': 1.8.3 - '@biomejs/cli-linux-arm64-musl': 1.8.3 - '@biomejs/cli-linux-x64': 1.8.3 - '@biomejs/cli-linux-x64-musl': 1.8.3 - '@biomejs/cli-win32-arm64': 1.8.3 - '@biomejs/cli-win32-x64': 1.8.3 + '@biomejs/cli-darwin-arm64': 1.9.2 + '@biomejs/cli-darwin-x64': 1.9.2 + '@biomejs/cli-linux-arm64': 1.9.2 + '@biomejs/cli-linux-arm64-musl': 1.9.2 + '@biomejs/cli-linux-x64': 1.9.2 + '@biomejs/cli-linux-x64-musl': 1.9.2 + '@biomejs/cli-win32-arm64': 1.9.2 + '@biomejs/cli-win32-x64': 1.9.2 - '@biomejs/cli-darwin-arm64@1.8.3': + '@biomejs/cli-darwin-arm64@1.9.2': optional: true - '@biomejs/cli-darwin-x64@1.8.3': + '@biomejs/cli-darwin-x64@1.9.2': optional: true - '@biomejs/cli-linux-arm64-musl@1.8.3': + '@biomejs/cli-linux-arm64-musl@1.9.2': optional: true - '@biomejs/cli-linux-arm64@1.8.3': + '@biomejs/cli-linux-arm64@1.9.2': optional: true - '@biomejs/cli-linux-x64-musl@1.8.3': + '@biomejs/cli-linux-x64-musl@1.9.2': optional: true - '@biomejs/cli-linux-x64@1.8.3': + '@biomejs/cli-linux-x64@1.9.2': optional: true - '@biomejs/cli-win32-arm64@1.8.3': + '@biomejs/cli-win32-arm64@1.9.2': optional: true - '@biomejs/cli-win32-x64@1.8.3': + '@biomejs/cli-win32-x64@1.9.2': optional: true - '@types/node@20.16.5': + '@types/node@20.16.10': dependencies: undici-types: 6.19.8 - typescript@5.5.4: {} + typescript@5.6.2: {} undici-types@6.19.8: {} From 139de727046e5bc084377412c02f78ae1573772c Mon Sep 17 00:00:00 2001 From: MarcioJRGodoi Date: Tue, 1 Oct 2024 12:57:24 -0300 Subject: [PATCH 24/76] fix: ajuste unidade de medida --- dist/unidades_medida.js | 8 ++-- dist/unidades_medida.js.map | 2 +- package.json | 7 ++-- pnpm-lock.yaml | 74 ++++++++++++++++++------------------- src/unidades_medida.ts | 8 ++-- 5 files changed, 50 insertions(+), 49 deletions(-) diff --git a/dist/unidades_medida.js b/dist/unidades_medida.js index b3d08d1..fc3a638 100644 --- a/dist/unidades_medida.js +++ b/dist/unidades_medida.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.unidades_medida = void 0; exports.unidades_medida = [ { - unidade: "kg", + unidade: "KG", nome: "Quilograma", unidade_normalizada: "kg", normalizar: (valor) => valor, @@ -17,21 +17,21 @@ exports.unidades_medida = [ tipo: "massa", }, { - unidade: "ton", + unidade: "TON", nome: "Tonelada", unidade_normalizada: "kg", normalizar: (valor) => valor * 1000, tipo: "massa", }, { - unidade: "L", + unidade: "Lt", nome: "Litro", unidade_normalizada: "L", normalizar: (valor) => valor, tipo: "volume", }, { - unidade: "m3", + unidade: "M³", nome: "Metro Cúbico", unidade_normalizada: "L", normalizar: (valor) => valor * 1000, diff --git a/dist/unidades_medida.js.map b/dist/unidades_medida.js.map index 1204af2..d18ef5e 100644 --- a/dist/unidades_medida.js.map +++ b/dist/unidades_medida.js.map @@ -1 +1 @@ -{"version":3,"file":"unidades_medida.js","sourceRoot":"","sources":["../src/unidades_medida.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAMtB;IACJ;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,UAAU;QAChB,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,cAAc;QACpB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,WAAW;QACjB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,GAAG;QAC1C,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,WAAW;QACjB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,aAAa;KACpB;CACF,CAAA"} \ No newline at end of file +{"version":3,"file":"unidades_medida.js","sourceRoot":"","sources":["../src/unidades_medida.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAMtB;IACJ;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,UAAU;QAChB,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,cAAc;QACpB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,WAAW;QACjB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,GAAG;QAC1C,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,WAAW;QACjB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,aAAa;KACpB;CACF,CAAA"} \ No newline at end of file diff --git a/package.json b/package.json index 7215604..072b6e5 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,12 @@ { "name": "p-comuns", - "version": "0.51.0", + "version": "0.54.0", "description": "", "main": "dist/index.js", "scripts": { "build": "rm -rf ./dist && pnpm run biome && npm --no-git-tag-version version minor && tsc", - "biome": "npx @biomejs/biome check --write ./src" + "biome": "npx @biomejs/biome check --write ./src", + "up": "pnpm up \"@biomejs/biome\" " }, "author": { "name": "AZTECA SOFTWARE LTDA", @@ -17,7 +18,7 @@ "zod": "3.23.8" }, "devDependencies": { - "@biomejs/biome": "latest", + "@biomejs/biome": "^1.9.3", "@types/node": "^20.16.10" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5237f60..f099d4a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,63 +16,63 @@ importers: version: 3.23.8 devDependencies: '@biomejs/biome': - specifier: latest - version: 1.9.2 + specifier: ^1.9.3 + version: 1.9.3 '@types/node': specifier: ^20.16.10 version: 20.16.10 packages: - '@biomejs/biome@1.9.2': - resolution: {integrity: sha512-4j2Gfwft8Jqp1X0qLYvK4TEy4xhTo4o6rlvJPsjPeEame8gsmbGQfOPBkw7ur+7/Z/f0HZmCZKqbMvR7vTXQYQ==} + '@biomejs/biome@1.9.3': + resolution: {integrity: sha512-POjAPz0APAmX33WOQFGQrwLvlu7WLV4CFJMlB12b6ZSg+2q6fYu9kZwLCOA+x83zXfcPd1RpuWOKJW0GbBwLIQ==} engines: {node: '>=14.21.3'} hasBin: true - '@biomejs/cli-darwin-arm64@1.9.2': - resolution: {integrity: sha512-rbs9uJHFmhqB3Td0Ro+1wmeZOHhAPTL3WHr8NtaVczUmDhXkRDWScaxicG9+vhSLj1iLrW47itiK6xiIJy6vaA==} + '@biomejs/cli-darwin-arm64@1.9.3': + resolution: {integrity: sha512-QZzD2XrjJDUyIZK+aR2i5DDxCJfdwiYbUKu9GzkCUJpL78uSelAHAPy7m0GuPMVtF/Uo+OKv97W3P9nuWZangQ==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [darwin] - '@biomejs/cli-darwin-x64@1.9.2': - resolution: {integrity: sha512-BlfULKijNaMigQ9GH9fqJVt+3JTDOSiZeWOQtG/1S1sa8Lp046JHG3wRJVOvekTPL9q/CNFW1NVG8J0JN+L1OA==} + '@biomejs/cli-darwin-x64@1.9.3': + resolution: {integrity: sha512-vSCoIBJE0BN3SWDFuAY/tRavpUtNoqiceJ5PrU3xDfsLcm/U6N93JSM0M9OAiC/X7mPPfejtr6Yc9vSgWlEgVw==} engines: {node: '>=14.21.3'} cpu: [x64] os: [darwin] - '@biomejs/cli-linux-arm64-musl@1.9.2': - resolution: {integrity: sha512-ZATvbUWhNxegSALUnCKWqetTZqrK72r2RsFD19OK5jXDj/7o1hzI1KzDNG78LloZxftrwr3uI9SqCLh06shSZw==} + '@biomejs/cli-linux-arm64-musl@1.9.3': + resolution: {integrity: sha512-VBzyhaqqqwP3bAkkBrhVq50i3Uj9+RWuj+pYmXrMDgjS5+SKYGE56BwNw4l8hR3SmYbLSbEo15GcV043CDSk+Q==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-arm64@1.9.2': - resolution: {integrity: sha512-T8TJuSxuBDeQCQzxZu2o3OU4eyLumTofhCxxFd3+aH2AEWVMnH7Z/c3QP1lHI5RRMBP9xIJeMORqDQ5j+gVZzw==} + '@biomejs/cli-linux-arm64@1.9.3': + resolution: {integrity: sha512-vJkAimD2+sVviNTbaWOGqEBy31cW0ZB52KtpVIbkuma7PlfII3tsLhFa+cwbRAcRBkobBBhqZ06hXoZAN8NODQ==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-x64-musl@1.9.2': - resolution: {integrity: sha512-CjPM6jT1miV5pry9C7qv8YJk0FIZvZd86QRD3atvDgfgeh9WQU0k2Aoo0xUcPdTnoz0WNwRtDicHxwik63MmSg==} + '@biomejs/cli-linux-x64-musl@1.9.3': + resolution: {integrity: sha512-TJmnOG2+NOGM72mlczEsNki9UT+XAsMFAOo8J0me/N47EJ/vkLXxf481evfHLlxMejTY6IN8SdRSiPVLv6AHlA==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-linux-x64@1.9.2': - resolution: {integrity: sha512-T0cPk3C3Jr2pVlsuQVTBqk2qPjTm8cYcTD9p/wmR9MeVqui1C/xTVfOIwd3miRODFMrJaVQ8MYSXnVIhV9jTjg==} + '@biomejs/cli-linux-x64@1.9.3': + resolution: {integrity: sha512-x220V4c+romd26Mu1ptU+EudMXVS4xmzKxPVb9mgnfYlN4Yx9vD5NZraSx/onJnd3Gh/y8iPUdU5CDZJKg9COA==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-win32-arm64@1.9.2': - resolution: {integrity: sha512-2x7gSty75bNIeD23ZRPXyox6Z/V0M71ObeJtvQBhi1fgrvPdtkEuw7/0wEHg6buNCubzOFuN9WYJm6FKoUHfhg==} + '@biomejs/cli-win32-arm64@1.9.3': + resolution: {integrity: sha512-lg/yZis2HdQGsycUvHWSzo9kOvnGgvtrYRgoCEwPBwwAL8/6crOp3+f47tPwI/LI1dZrhSji7PNsGKGHbwyAhw==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [win32] - '@biomejs/cli-win32-x64@1.9.2': - resolution: {integrity: sha512-JC3XvdYcjmu1FmAehVwVV0SebLpeNTnO2ZaMdGCSOdS7f8O9Fq14T2P1gTG1Q29Q8Dt1S03hh0IdVpIZykOL8g==} + '@biomejs/cli-win32-x64@1.9.3': + resolution: {integrity: sha512-cQMy2zanBkVLpmmxXdK6YePzmZx0s5Z7KEnwmrW54rcXK3myCNbQa09SwGZ8i/8sLw0H9F3X7K4rxVNGU8/D4Q==} engines: {node: '>=14.21.3'} cpu: [x64] os: [win32] @@ -93,39 +93,39 @@ packages: snapshots: - '@biomejs/biome@1.9.2': + '@biomejs/biome@1.9.3': optionalDependencies: - '@biomejs/cli-darwin-arm64': 1.9.2 - '@biomejs/cli-darwin-x64': 1.9.2 - '@biomejs/cli-linux-arm64': 1.9.2 - '@biomejs/cli-linux-arm64-musl': 1.9.2 - '@biomejs/cli-linux-x64': 1.9.2 - '@biomejs/cli-linux-x64-musl': 1.9.2 - '@biomejs/cli-win32-arm64': 1.9.2 - '@biomejs/cli-win32-x64': 1.9.2 + '@biomejs/cli-darwin-arm64': 1.9.3 + '@biomejs/cli-darwin-x64': 1.9.3 + '@biomejs/cli-linux-arm64': 1.9.3 + '@biomejs/cli-linux-arm64-musl': 1.9.3 + '@biomejs/cli-linux-x64': 1.9.3 + '@biomejs/cli-linux-x64-musl': 1.9.3 + '@biomejs/cli-win32-arm64': 1.9.3 + '@biomejs/cli-win32-x64': 1.9.3 - '@biomejs/cli-darwin-arm64@1.9.2': + '@biomejs/cli-darwin-arm64@1.9.3': optional: true - '@biomejs/cli-darwin-x64@1.9.2': + '@biomejs/cli-darwin-x64@1.9.3': optional: true - '@biomejs/cli-linux-arm64-musl@1.9.2': + '@biomejs/cli-linux-arm64-musl@1.9.3': optional: true - '@biomejs/cli-linux-arm64@1.9.2': + '@biomejs/cli-linux-arm64@1.9.3': optional: true - '@biomejs/cli-linux-x64-musl@1.9.2': + '@biomejs/cli-linux-x64-musl@1.9.3': optional: true - '@biomejs/cli-linux-x64@1.9.2': + '@biomejs/cli-linux-x64@1.9.3': optional: true - '@biomejs/cli-win32-arm64@1.9.2': + '@biomejs/cli-win32-arm64@1.9.3': optional: true - '@biomejs/cli-win32-x64@1.9.2': + '@biomejs/cli-win32-x64@1.9.3': optional: true '@types/node@20.16.10': diff --git a/src/unidades_medida.ts b/src/unidades_medida.ts index 27542ca..0224929 100644 --- a/src/unidades_medida.ts +++ b/src/unidades_medida.ts @@ -6,7 +6,7 @@ export const unidades_medida: { tipo: "massa" | "volume" | "comprimento" }[] = [ { - unidade: "kg", + unidade: "KG", nome: "Quilograma", unidade_normalizada: "kg", normalizar: (valor: number) => valor, @@ -20,21 +20,21 @@ export const unidades_medida: { tipo: "massa", }, { - unidade: "ton", + unidade: "TON", nome: "Tonelada", unidade_normalizada: "kg", normalizar: (valor: number) => valor * 1000, tipo: "massa", }, { - unidade: "L", + unidade: "Lt", nome: "Litro", unidade_normalizada: "L", normalizar: (valor: number) => valor, tipo: "volume", }, { - unidade: "m3", + unidade: "M³", nome: "Metro Cúbico", unidade_normalizada: "L", normalizar: (valor: number) => valor * 1000, From 2127357b336e85be996b99421d1dedbc2f1c8f45 Mon Sep 17 00:00:00 2001 From: MarcioJRGodoi Date: Wed, 9 Oct 2024 15:12:31 -0300 Subject: [PATCH 25/76] build: build --- dist/unidades_medida.d.ts | 2 +- dist/unidades_medida.js | 7 +++++++ dist/unidades_medida.js.map | 2 +- package.json | 2 +- src/unidades_medida.ts | 9 ++++++++- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dist/unidades_medida.d.ts b/dist/unidades_medida.d.ts index 53f8b64..78e6af9 100644 --- a/dist/unidades_medida.d.ts +++ b/dist/unidades_medida.d.ts @@ -3,5 +3,5 @@ export declare const unidades_medida: { nome: string; unidade_normalizada: string; normalizar: (valor: number) => number; - tipo: "massa" | "volume" | "comprimento"; + tipo: "massa" | "volume" | "comprimento" | "unidade"; }[]; diff --git a/dist/unidades_medida.js b/dist/unidades_medida.js index fc3a638..0890b5f 100644 --- a/dist/unidades_medida.js +++ b/dist/unidades_medida.js @@ -72,5 +72,12 @@ exports.unidades_medida = [ normalizar: (valor) => valor * 1000, tipo: "comprimento", }, + { + unidade: "UN", + nome: "Unidade", + unidade_normalizada: "Un", + normalizar: (valor) => valor, + tipo: "unidade", + }, ]; //# sourceMappingURL=unidades_medida.js.map \ No newline at end of file diff --git a/dist/unidades_medida.js.map b/dist/unidades_medida.js.map index d18ef5e..4b70882 100644 --- a/dist/unidades_medida.js.map +++ b/dist/unidades_medida.js.map @@ -1 +1 @@ -{"version":3,"file":"unidades_medida.js","sourceRoot":"","sources":["../src/unidades_medida.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAMtB;IACJ;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,UAAU;QAChB,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,cAAc;QACpB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,WAAW;QACjB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,GAAG;QAC1C,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,WAAW;QACjB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,aAAa;KACpB;CACF,CAAA"} \ No newline at end of file +{"version":3,"file":"unidades_medida.js","sourceRoot":"","sources":["../src/unidades_medida.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAMtB;IACJ;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,UAAU;QAChB,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,cAAc;QACpB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,WAAW;QACjB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,GAAG;QAC1C,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,WAAW;QACjB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,SAAS;QACf,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,SAAS;KAChB;CACF,CAAA"} \ No newline at end of file diff --git a/package.json b/package.json index 072b6e5..f0a0744 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.54.0", + "version": "0.56.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/unidades_medida.ts b/src/unidades_medida.ts index 0224929..5047504 100644 --- a/src/unidades_medida.ts +++ b/src/unidades_medida.ts @@ -3,7 +3,7 @@ export const unidades_medida: { nome: string unidade_normalizada: string normalizar: (valor: number) => number - tipo: "massa" | "volume" | "comprimento" + tipo: "massa" | "volume" | "comprimento" | "unidade" }[] = [ { unidade: "KG", @@ -75,4 +75,11 @@ export const unidades_medida: { normalizar: (valor: number) => valor * 1000, tipo: "comprimento", }, + { + unidade: "UN", + nome: "Unidade", + unidade_normalizada: "Un", + normalizar: (valor: number) => valor, + tipo: "unidade", + }, ] From 0ff1eab713aeb99fea38c6b696ac4e360d349d41 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Fri, 11 Oct 2024 15:14:11 -0300 Subject: [PATCH 26/76] at --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f0a0744..8bc691e 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "build": "rm -rf ./dist && pnpm run biome && npm --no-git-tag-version version minor && tsc", "biome": "npx @biomejs/biome check --write ./src", - "up": "pnpm up \"@biomejs/biome\" " + "at": "pnpm up \"@biomejs/biome\" " }, "author": { "name": "AZTECA SOFTWARE LTDA", From 17c0d244234c5ceb1a078317920f84cfa44dbec4 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Wed, 16 Oct 2024 17:07:16 -0300 Subject: [PATCH 27/76] . --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8bc691e..72eb35b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "p-comuns", "version": "0.56.0", "description": "", - "main": "dist/index.js", + "main": "src/index.ts", "scripts": { "build": "rm -rf ./dist && pnpm run biome && npm --no-git-tag-version version minor && tsc", "biome": "npx @biomejs/biome check --write ./src", From 39c2ed86d47341528136aaa61c2dec469578d81d Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Wed, 16 Oct 2024 17:09:25 -0300 Subject: [PATCH 28/76] . --- package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package.json b/package.json index 72eb35b..bb268e9 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,11 @@ "version": "0.56.0", "description": "", "main": "src/index.ts", + "exports": { + ".": { + "require": "./dist/index.js" + } + }, "scripts": { "build": "rm -rf ./dist && pnpm run biome && npm --no-git-tag-version version minor && tsc", "biome": "npx @biomejs/biome check --write ./src", From a597006f0d19d4c7ce691a8e8ebdd0765aebfa9e Mon Sep 17 00:00:00 2001 From: MarcioJRGodoi Date: Thu, 17 Oct 2024 09:04:13 -0300 Subject: [PATCH 29/76] fix: correcao package json --- package.json | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index bb268e9..fddbc86 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,12 @@ { "name": "p-comuns", - "version": "0.56.0", + "version": "0.57.0", "description": "", - "main": "src/index.ts", - "exports": { - ".": { - "require": "./dist/index.js" - } - }, + "main": "dist/index.js", "scripts": { "build": "rm -rf ./dist && pnpm run biome && npm --no-git-tag-version version minor && tsc", "biome": "npx @biomejs/biome check --write ./src", - "at": "pnpm up \"@biomejs/biome\" " + "up": "pnpm up \"@biomejs/biome\" " }, "author": { "name": "AZTECA SOFTWARE LTDA", From ebc62030f60d354d8285aba0c16cd1356a39b23c Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Thu, 17 Oct 2024 14:16:00 -0300 Subject: [PATCH 30/76] build --- Documentos/biome.json | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentos/biome.json b/Documentos/biome.json index bd037d6..b81b01f 100644 --- a/Documentos/biome.json +++ b/Documentos/biome.json @@ -5,6 +5,7 @@ }, "linter": { "enabled": true, + "rules": { "recommended": true, "suspicious": { @@ -30,6 +31,9 @@ }, "performance": { "noAccumulatingSpread": "off" + }, + "a11y": { + "useSemanticElements": "off" } } }, diff --git a/package.json b/package.json index fddbc86..dbb740e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.57.0", + "version": "0.58.0", "description": "", "main": "dist/index.js", "scripts": { From 1644c380a8bc4751965f851d77f90ffd524ef74c Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Wed, 23 Oct 2024 18:00:18 -0300 Subject: [PATCH 31/76] build --- package.json | 6 ++-- pnpm-lock.yaml | 74 +++++++++++++++++++++++++------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index dbb740e..b393e65 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "p-comuns", - "version": "0.58.0", + "version": "0.59.0", "description": "", "main": "dist/index.js", "scripts": { "build": "rm -rf ./dist && pnpm run biome && npm --no-git-tag-version version minor && tsc", "biome": "npx @biomejs/biome check --write ./src", - "up": "pnpm up \"@biomejs/biome\" " + "at": "pnpm up \"@biomejs/biome\" " }, "author": { "name": "AZTECA SOFTWARE LTDA", @@ -18,7 +18,7 @@ "zod": "3.23.8" }, "devDependencies": { - "@biomejs/biome": "^1.9.3", + "@biomejs/biome": "^1.9.4", "@types/node": "^20.16.10" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f099d4a..1fc3295 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,63 +16,63 @@ importers: version: 3.23.8 devDependencies: '@biomejs/biome': - specifier: ^1.9.3 - version: 1.9.3 + specifier: ^1.9.4 + version: 1.9.4 '@types/node': specifier: ^20.16.10 version: 20.16.10 packages: - '@biomejs/biome@1.9.3': - resolution: {integrity: sha512-POjAPz0APAmX33WOQFGQrwLvlu7WLV4CFJMlB12b6ZSg+2q6fYu9kZwLCOA+x83zXfcPd1RpuWOKJW0GbBwLIQ==} + '@biomejs/biome@1.9.4': + resolution: {integrity: sha512-1rkd7G70+o9KkTn5KLmDYXihGoTaIGO9PIIN2ZB7UJxFrWw04CZHPYiMRjYsaDvVV7hP1dYNRLxSANLaBFGpog==} engines: {node: '>=14.21.3'} hasBin: true - '@biomejs/cli-darwin-arm64@1.9.3': - resolution: {integrity: sha512-QZzD2XrjJDUyIZK+aR2i5DDxCJfdwiYbUKu9GzkCUJpL78uSelAHAPy7m0GuPMVtF/Uo+OKv97W3P9nuWZangQ==} + '@biomejs/cli-darwin-arm64@1.9.4': + resolution: {integrity: sha512-bFBsPWrNvkdKrNCYeAp+xo2HecOGPAy9WyNyB/jKnnedgzl4W4Hb9ZMzYNbf8dMCGmUdSavlYHiR01QaYR58cw==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [darwin] - '@biomejs/cli-darwin-x64@1.9.3': - resolution: {integrity: sha512-vSCoIBJE0BN3SWDFuAY/tRavpUtNoqiceJ5PrU3xDfsLcm/U6N93JSM0M9OAiC/X7mPPfejtr6Yc9vSgWlEgVw==} + '@biomejs/cli-darwin-x64@1.9.4': + resolution: {integrity: sha512-ngYBh/+bEedqkSevPVhLP4QfVPCpb+4BBe2p7Xs32dBgs7rh9nY2AIYUL6BgLw1JVXV8GlpKmb/hNiuIxfPfZg==} engines: {node: '>=14.21.3'} cpu: [x64] os: [darwin] - '@biomejs/cli-linux-arm64-musl@1.9.3': - resolution: {integrity: sha512-VBzyhaqqqwP3bAkkBrhVq50i3Uj9+RWuj+pYmXrMDgjS5+SKYGE56BwNw4l8hR3SmYbLSbEo15GcV043CDSk+Q==} + '@biomejs/cli-linux-arm64-musl@1.9.4': + resolution: {integrity: sha512-v665Ct9WCRjGa8+kTr0CzApU0+XXtRgwmzIf1SeKSGAv+2scAlW6JR5PMFo6FzqqZ64Po79cKODKf3/AAmECqA==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-arm64@1.9.3': - resolution: {integrity: sha512-vJkAimD2+sVviNTbaWOGqEBy31cW0ZB52KtpVIbkuma7PlfII3tsLhFa+cwbRAcRBkobBBhqZ06hXoZAN8NODQ==} + '@biomejs/cli-linux-arm64@1.9.4': + resolution: {integrity: sha512-fJIW0+LYujdjUgJJuwesP4EjIBl/N/TcOX3IvIHJQNsAqvV2CHIogsmA94BPG6jZATS4Hi+xv4SkBBQSt1N4/g==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-x64-musl@1.9.3': - resolution: {integrity: sha512-TJmnOG2+NOGM72mlczEsNki9UT+XAsMFAOo8J0me/N47EJ/vkLXxf481evfHLlxMejTY6IN8SdRSiPVLv6AHlA==} + '@biomejs/cli-linux-x64-musl@1.9.4': + resolution: {integrity: sha512-gEhi/jSBhZ2m6wjV530Yy8+fNqG8PAinM3oV7CyO+6c3CEh16Eizm21uHVsyVBEB6RIM8JHIl6AGYCv6Q6Q9Tg==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-linux-x64@1.9.3': - resolution: {integrity: sha512-x220V4c+romd26Mu1ptU+EudMXVS4xmzKxPVb9mgnfYlN4Yx9vD5NZraSx/onJnd3Gh/y8iPUdU5CDZJKg9COA==} + '@biomejs/cli-linux-x64@1.9.4': + resolution: {integrity: sha512-lRCJv/Vi3Vlwmbd6K+oQ0KhLHMAysN8lXoCI7XeHlxaajk06u7G+UsFSO01NAs5iYuWKmVZjmiOzJ0OJmGsMwg==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-win32-arm64@1.9.3': - resolution: {integrity: sha512-lg/yZis2HdQGsycUvHWSzo9kOvnGgvtrYRgoCEwPBwwAL8/6crOp3+f47tPwI/LI1dZrhSji7PNsGKGHbwyAhw==} + '@biomejs/cli-win32-arm64@1.9.4': + resolution: {integrity: sha512-tlbhLk+WXZmgwoIKwHIHEBZUwxml7bRJgk0X2sPyNR3S93cdRq6XulAZRQJ17FYGGzWne0fgrXBKpl7l4M87Hg==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [win32] - '@biomejs/cli-win32-x64@1.9.3': - resolution: {integrity: sha512-cQMy2zanBkVLpmmxXdK6YePzmZx0s5Z7KEnwmrW54rcXK3myCNbQa09SwGZ8i/8sLw0H9F3X7K4rxVNGU8/D4Q==} + '@biomejs/cli-win32-x64@1.9.4': + resolution: {integrity: sha512-8Y5wMhVIPaWe6jw2H+KlEm4wP/f7EW3810ZLmDlrEEy5KvBsb9ECEfu/kMWD484ijfQ8+nIi0giMgu9g1UAuuA==} engines: {node: '>=14.21.3'} cpu: [x64] os: [win32] @@ -93,39 +93,39 @@ packages: snapshots: - '@biomejs/biome@1.9.3': + '@biomejs/biome@1.9.4': optionalDependencies: - '@biomejs/cli-darwin-arm64': 1.9.3 - '@biomejs/cli-darwin-x64': 1.9.3 - '@biomejs/cli-linux-arm64': 1.9.3 - '@biomejs/cli-linux-arm64-musl': 1.9.3 - '@biomejs/cli-linux-x64': 1.9.3 - '@biomejs/cli-linux-x64-musl': 1.9.3 - '@biomejs/cli-win32-arm64': 1.9.3 - '@biomejs/cli-win32-x64': 1.9.3 + '@biomejs/cli-darwin-arm64': 1.9.4 + '@biomejs/cli-darwin-x64': 1.9.4 + '@biomejs/cli-linux-arm64': 1.9.4 + '@biomejs/cli-linux-arm64-musl': 1.9.4 + '@biomejs/cli-linux-x64': 1.9.4 + '@biomejs/cli-linux-x64-musl': 1.9.4 + '@biomejs/cli-win32-arm64': 1.9.4 + '@biomejs/cli-win32-x64': 1.9.4 - '@biomejs/cli-darwin-arm64@1.9.3': + '@biomejs/cli-darwin-arm64@1.9.4': optional: true - '@biomejs/cli-darwin-x64@1.9.3': + '@biomejs/cli-darwin-x64@1.9.4': optional: true - '@biomejs/cli-linux-arm64-musl@1.9.3': + '@biomejs/cli-linux-arm64-musl@1.9.4': optional: true - '@biomejs/cli-linux-arm64@1.9.3': + '@biomejs/cli-linux-arm64@1.9.4': optional: true - '@biomejs/cli-linux-x64-musl@1.9.3': + '@biomejs/cli-linux-x64-musl@1.9.4': optional: true - '@biomejs/cli-linux-x64@1.9.3': + '@biomejs/cli-linux-x64@1.9.4': optional: true - '@biomejs/cli-win32-arm64@1.9.3': + '@biomejs/cli-win32-arm64@1.9.4': optional: true - '@biomejs/cli-win32-x64@1.9.3': + '@biomejs/cli-win32-x64@1.9.4': optional: true '@types/node@20.16.10': From f832edf1b9bb57bf07db73902ff1b24377d98e22 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Fri, 25 Oct 2024 09:12:22 -0300 Subject: [PATCH 32/76] build --- dist/unidades_medida.d.ts | 20 ++++++++- dist/unidades_medida.js | 78 ++++++++++++++-------------------- dist/unidades_medida.js.map | 2 +- package.json | 4 +- src/unidades_medida.ts | 83 +++++++++++++++---------------------- 5 files changed, 85 insertions(+), 102 deletions(-) diff --git a/dist/unidades_medida.d.ts b/dist/unidades_medida.d.ts index 78e6af9..4dfbc46 100644 --- a/dist/unidades_medida.d.ts +++ b/dist/unidades_medida.d.ts @@ -1,7 +1,23 @@ +/** + * Essa variável se conecta a tabela_lidades + * + * onde sigla se conecta com sigla + * + * Usuário terá mais opções de unidades, quando fazer o envio para o mtr, usar a opção fornecida pelo usuarios, caso não tenha + * usar a normalizada + */ +export declare enum siglas_unidades_medida { + UN = "UN", + KG = "KG", + TON = "TON", + g = "g", + "M³" = "M\u00B3", + Lt = "Lt" +} export declare const unidades_medida: { - unidade: string; + sigla: keyof typeof siglas_unidades_medida; nome: string; - unidade_normalizada: string; + sigla_normalizada: keyof typeof siglas_unidades_medida; normalizar: (valor: number) => number; tipo: "massa" | "volume" | "comprimento" | "unidade"; }[]; diff --git a/dist/unidades_medida.js b/dist/unidades_medida.js index 0890b5f..def3e50 100644 --- a/dist/unidades_medida.js +++ b/dist/unidades_medida.js @@ -1,81 +1,63 @@ "use strict"; +/** + * Essa variável se conecta a tabela_lidades + * + * onde sigla se conecta com sigla + * + * Usuário terá mais opções de unidades, quando fazer o envio para o mtr, usar a opção fornecida pelo usuarios, caso não tenha + * usar a normalizada + */ Object.defineProperty(exports, "__esModule", { value: true }); -exports.unidades_medida = void 0; +exports.unidades_medida = exports.siglas_unidades_medida = void 0; +var siglas_unidades_medida; +(function (siglas_unidades_medida) { + siglas_unidades_medida["UN"] = "UN"; + siglas_unidades_medida["KG"] = "KG"; + siglas_unidades_medida["TON"] = "TON"; + siglas_unidades_medida["g"] = "g"; + siglas_unidades_medida["M\u00B3"] = "M\u00B3"; + siglas_unidades_medida["Lt"] = "Lt"; +})(siglas_unidades_medida || (exports.siglas_unidades_medida = siglas_unidades_medida = {})); exports.unidades_medida = [ { - unidade: "KG", + sigla: "KG", nome: "Quilograma", - unidade_normalizada: "kg", + sigla_normalizada: "KG", normalizar: (valor) => valor, tipo: "massa", }, { - unidade: "g", + sigla: "g", nome: "Grama", - unidade_normalizada: "kg", + sigla_normalizada: "KG", normalizar: (valor) => valor / 1000, tipo: "massa", }, { - unidade: "TON", + sigla: "TON", nome: "Tonelada", - unidade_normalizada: "kg", + sigla_normalizada: "KG", normalizar: (valor) => valor * 1000, tipo: "massa", }, { - unidade: "Lt", + sigla: "Lt", nome: "Litro", - unidade_normalizada: "L", + sigla_normalizada: "Lt", normalizar: (valor) => valor, tipo: "volume", }, { - unidade: "M³", + sigla: "M³", nome: "Metro Cúbico", - unidade_normalizada: "L", + sigla_normalizada: "Lt", normalizar: (valor) => valor * 1000, tipo: "volume", }, { - unidade: "mL", - nome: "Mililitro", - unidade_normalizada: "L", - normalizar: (valor) => valor / 1000, - tipo: "volume", - }, - { - unidade: "cm", - nome: "Centímetro", - unidade_normalizada: "m", - normalizar: (valor) => valor / 100, - tipo: "comprimento", - }, - { - unidade: "mm", - nome: "Milímetro", - unidade_normalizada: "m", - normalizar: (valor) => valor / 1000, - tipo: "comprimento", - }, - { - unidade: "m", - nome: "Metro", - unidade_normalizada: "m", - normalizar: (valor) => valor, - tipo: "comprimento", - }, - { - unidade: "km", - nome: "Quilômetro", - unidade_normalizada: "m", - normalizar: (valor) => valor * 1000, - tipo: "comprimento", - }, - { - unidade: "UN", + sigla: "UN", nome: "Unidade", - unidade_normalizada: "Un", + sigla_normalizada: "UN", normalizar: (valor) => valor, tipo: "unidade", }, diff --git a/dist/unidades_medida.js.map b/dist/unidades_medida.js.map index 4b70882..37ae75b 100644 --- a/dist/unidades_medida.js.map +++ b/dist/unidades_medida.js.map @@ -1 +1 @@ -{"version":3,"file":"unidades_medida.js","sourceRoot":"","sources":["../src/unidades_medida.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAMtB;IACJ;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,UAAU;QAChB,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,cAAc;QACpB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,WAAW;QACjB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,QAAQ;KACf;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,GAAG;QAC1C,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,WAAW;QACjB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,GAAG;QACZ,IAAI,EAAE,OAAO;QACb,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY;QAClB,mBAAmB,EAAE,GAAG;QACxB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,aAAa;KACpB;IACD;QACE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,SAAS;QACf,mBAAmB,EAAE,IAAI;QACzB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,SAAS;KAChB;CACF,CAAA"} \ No newline at end of file +{"version":3,"file":"unidades_medida.js","sourceRoot":"","sources":["../src/unidades_medida.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAEH,IAAY,sBASX;AATD,WAAY,sBAAsB;IAChC,mCAAS,CAAA;IAET,mCAAS,CAAA;IACT,qCAAW,CAAA;IACX,iCAAO,CAAA;IAEP,6CAAW,CAAA;IACX,mCAAS,CAAA;AACX,CAAC,EATW,sBAAsB,sCAAtB,sBAAsB,QASjC;AAEY,QAAA,eAAe,GAMtB;IACJ;QACE,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,YAAY;QAClB,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,OAAO;KACd;IACD;QACE,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,OAAO;QACb,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,UAAU;QAChB,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,OAAO;QACb,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,QAAQ;KACf;IACD;QACE,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,cAAc;QACpB,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,QAAQ;KACf;IACD;QACE,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,SAAS;QACf,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,SAAS;KAChB;CACF,CAAA"} \ No newline at end of file diff --git a/package.json b/package.json index b393e65..e658a5e 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "p-comuns", - "version": "0.59.0", + "version": "0.60.0", "description": "", "main": "dist/index.js", "scripts": { "build": "rm -rf ./dist && pnpm run biome && npm --no-git-tag-version version minor && tsc", "biome": "npx @biomejs/biome check --write ./src", - "at": "pnpm up \"@biomejs/biome\" " + "at": "pnpm up @biomejs/biome typescript" }, "author": { "name": "AZTECA SOFTWARE LTDA", diff --git a/src/unidades_medida.ts b/src/unidades_medida.ts index 5047504..d207570 100644 --- a/src/unidades_medida.ts +++ b/src/unidades_medida.ts @@ -1,84 +1,69 @@ +/** + * Essa variável se conecta a tabela_lidades + * + * onde sigla se conecta com sigla + * + * Usuário terá mais opções de unidades, quando fazer o envio para o mtr, usar a opção fornecida pelo usuarios, caso não tenha + * usar a normalizada + */ + +export enum siglas_unidades_medida { + UN = "UN", + + KG = "KG", + TON = "TON", + g = "g", + + "M³" = "M³", + Lt = "Lt", +} + export const unidades_medida: { - unidade: string + sigla: keyof typeof siglas_unidades_medida nome: string - unidade_normalizada: string + sigla_normalizada: keyof typeof siglas_unidades_medida normalizar: (valor: number) => number tipo: "massa" | "volume" | "comprimento" | "unidade" }[] = [ { - unidade: "KG", + sigla: "KG", nome: "Quilograma", - unidade_normalizada: "kg", + sigla_normalizada: "KG", normalizar: (valor: number) => valor, tipo: "massa", }, { - unidade: "g", + sigla: "g", nome: "Grama", - unidade_normalizada: "kg", + sigla_normalizada: "KG", normalizar: (valor: number) => valor / 1000, tipo: "massa", }, { - unidade: "TON", + sigla: "TON", nome: "Tonelada", - unidade_normalizada: "kg", + sigla_normalizada: "KG", normalizar: (valor: number) => valor * 1000, tipo: "massa", }, { - unidade: "Lt", + sigla: "Lt", nome: "Litro", - unidade_normalizada: "L", + sigla_normalizada: "Lt", normalizar: (valor: number) => valor, tipo: "volume", }, { - unidade: "M³", + sigla: "M³", nome: "Metro Cúbico", - unidade_normalizada: "L", + sigla_normalizada: "Lt", normalizar: (valor: number) => valor * 1000, tipo: "volume", }, { - unidade: "mL", - nome: "Mililitro", - unidade_normalizada: "L", - normalizar: (valor: number) => valor / 1000, - tipo: "volume", - }, - { - unidade: "cm", - nome: "Centímetro", - unidade_normalizada: "m", - normalizar: (valor: number) => valor / 100, - tipo: "comprimento", - }, - { - unidade: "mm", - nome: "Milímetro", - unidade_normalizada: "m", - normalizar: (valor: number) => valor / 1000, - tipo: "comprimento", - }, - { - unidade: "m", - nome: "Metro", - unidade_normalizada: "m", - normalizar: (valor: number) => valor, - tipo: "comprimento", - }, - { - unidade: "km", - nome: "Quilômetro", - unidade_normalizada: "m", - normalizar: (valor: number) => valor * 1000, - tipo: "comprimento", - }, - { - unidade: "UN", + sigla: "UN", nome: "Unidade", - unidade_normalizada: "Un", + sigla_normalizada: "UN", normalizar: (valor: number) => valor, tipo: "unidade", }, From 9c06033134c1935c8481ad95d2c15617225728ca Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Fri, 25 Oct 2024 13:13:03 -0300 Subject: [PATCH 33/76] build --- dist/unidades_medida.d.ts | 2 +- dist/unidades_medida.js | 12 ++++++------ dist/unidades_medida.js.map | 2 +- package.json | 2 +- src/unidades_medida.ts | 14 +++++++------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dist/unidades_medida.d.ts b/dist/unidades_medida.d.ts index 4dfbc46..dfe57d6 100644 --- a/dist/unidades_medida.d.ts +++ b/dist/unidades_medida.d.ts @@ -15,7 +15,7 @@ export declare enum siglas_unidades_medida { Lt = "Lt" } export declare const unidades_medida: { - sigla: keyof typeof siglas_unidades_medida; + sigla_unidade: keyof typeof siglas_unidades_medida; nome: string; sigla_normalizada: keyof typeof siglas_unidades_medida; normalizar: (valor: number) => number; diff --git a/dist/unidades_medida.js b/dist/unidades_medida.js index def3e50..ea72e63 100644 --- a/dist/unidades_medida.js +++ b/dist/unidades_medida.js @@ -20,42 +20,42 @@ var siglas_unidades_medida; })(siglas_unidades_medida || (exports.siglas_unidades_medida = siglas_unidades_medida = {})); exports.unidades_medida = [ { - sigla: "KG", + sigla_unidade: "KG", nome: "Quilograma", sigla_normalizada: "KG", normalizar: (valor) => valor, tipo: "massa", }, { - sigla: "g", + sigla_unidade: "g", nome: "Grama", sigla_normalizada: "KG", normalizar: (valor) => valor / 1000, tipo: "massa", }, { - sigla: "TON", + sigla_unidade: "TON", nome: "Tonelada", sigla_normalizada: "KG", normalizar: (valor) => valor * 1000, tipo: "massa", }, { - sigla: "Lt", + sigla_unidade: "Lt", nome: "Litro", sigla_normalizada: "Lt", normalizar: (valor) => valor, tipo: "volume", }, { - sigla: "M³", + sigla_unidade: "M³", nome: "Metro Cúbico", sigla_normalizada: "Lt", normalizar: (valor) => valor * 1000, tipo: "volume", }, { - sigla: "UN", + sigla_unidade: "UN", nome: "Unidade", sigla_normalizada: "UN", normalizar: (valor) => valor, diff --git a/dist/unidades_medida.js.map b/dist/unidades_medida.js.map index 37ae75b..41c9b31 100644 --- a/dist/unidades_medida.js.map +++ b/dist/unidades_medida.js.map @@ -1 +1 @@ -{"version":3,"file":"unidades_medida.js","sourceRoot":"","sources":["../src/unidades_medida.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAEH,IAAY,sBASX;AATD,WAAY,sBAAsB;IAChC,mCAAS,CAAA;IAET,mCAAS,CAAA;IACT,qCAAW,CAAA;IACX,iCAAO,CAAA;IAEP,6CAAW,CAAA;IACX,mCAAS,CAAA;AACX,CAAC,EATW,sBAAsB,sCAAtB,sBAAsB,QASjC;AAEY,QAAA,eAAe,GAMtB;IACJ;QACE,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,YAAY;QAClB,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,OAAO;KACd;IACD;QACE,KAAK,EAAE,GAAG;QACV,IAAI,EAAE,OAAO;QACb,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,UAAU;QAChB,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,OAAO;QACb,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,QAAQ;KACf;IACD;QACE,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,cAAc;QACpB,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,QAAQ;KACf;IACD;QACE,KAAK,EAAE,IAAI;QACX,IAAI,EAAE,SAAS;QACf,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,SAAS;KAChB;CACF,CAAA"} \ No newline at end of file +{"version":3,"file":"unidades_medida.js","sourceRoot":"","sources":["../src/unidades_medida.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAEH,IAAY,sBASX;AATD,WAAY,sBAAsB;IAChC,mCAAS,CAAA;IAET,mCAAS,CAAA;IACT,qCAAW,CAAA;IACX,iCAAO,CAAA;IAEP,6CAAW,CAAA;IACX,mCAAS,CAAA;AACX,CAAC,EATW,sBAAsB,sCAAtB,sBAAsB,QASjC;AAEY,QAAA,eAAe,GAMtB;IACJ;QACE,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,YAAY;QAClB,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,OAAO;KACd;IACD;QACE,aAAa,EAAE,GAAG;QAClB,IAAI,EAAE,OAAO;QACb,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,aAAa,EAAE,KAAK;QACpB,IAAI,EAAE,UAAU;QAChB,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,OAAO;KACd;IACD;QACE,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,OAAO;QACb,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,QAAQ;KACf;IACD;QACE,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,cAAc;QACpB,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI;QAC3C,IAAI,EAAE,QAAQ;KACf;IACD;QACE,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,SAAS;QACf,iBAAiB,EAAE,IAAI;QACvB,UAAU,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK;QACpC,IAAI,EAAE,SAAS;KAChB;CACF,CAAA"} \ No newline at end of file diff --git a/package.json b/package.json index e658a5e..25a878b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.60.0", + "version": "0.61.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/unidades_medida.ts b/src/unidades_medida.ts index d207570..e679e75 100644 --- a/src/unidades_medida.ts +++ b/src/unidades_medida.ts @@ -19,49 +19,49 @@ export enum siglas_unidades_medida { } export const unidades_medida: { - sigla: keyof typeof siglas_unidades_medida + sigla_unidade: keyof typeof siglas_unidades_medida nome: string sigla_normalizada: keyof typeof siglas_unidades_medida normalizar: (valor: number) => number tipo: "massa" | "volume" | "comprimento" | "unidade" }[] = [ { - sigla: "KG", + sigla_unidade: "KG", nome: "Quilograma", sigla_normalizada: "KG", normalizar: (valor: number) => valor, tipo: "massa", }, { - sigla: "g", + sigla_unidade: "g", nome: "Grama", sigla_normalizada: "KG", normalizar: (valor: number) => valor / 1000, tipo: "massa", }, { - sigla: "TON", + sigla_unidade: "TON", nome: "Tonelada", sigla_normalizada: "KG", normalizar: (valor: number) => valor * 1000, tipo: "massa", }, { - sigla: "Lt", + sigla_unidade: "Lt", nome: "Litro", sigla_normalizada: "Lt", normalizar: (valor: number) => valor, tipo: "volume", }, { - sigla: "M³", + sigla_unidade: "M³", nome: "Metro Cúbico", sigla_normalizada: "Lt", normalizar: (valor: number) => valor * 1000, tipo: "volume", }, { - sigla: "UN", + sigla_unidade: "UN", nome: "Unidade", sigla_normalizada: "UN", normalizar: (valor: number) => valor, From 46869e2ed05ae1fcf2ab6e526ddcfddf47c865d7 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sun, 17 Nov 2024 11:46:20 -0300 Subject: [PATCH 34/76] melhoria de tipagem --- dist/tipagemRotas.js | 7 ++++++- dist/tipagemRotas.js.map | 2 +- package.json | 2 +- src/tipagemRotas.ts | 7 ++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dist/tipagemRotas.js b/dist/tipagemRotas.js index 9d1208d..98bcab9 100644 --- a/dist/tipagemRotas.js +++ b/dist/tipagemRotas.js @@ -32,7 +32,12 @@ class TipagemRotas { ** "/caminho" */ get caminho() { - return `/${this._partesCaminho.join("/")}`; + let ret = `/${this._partesCaminho.join("/")}`; + ret = ret.replace(/\/+/g, "/"); + if (ret.length > 1 && ret.endsWith("/")) { + ret = ret.slice(0, -1); + } + return ret; } /** Define o caminho completo da rota ** mCaminho.caminho = "/novoCaminho" diff --git a/dist/tipagemRotas.js.map b/dist/tipagemRotas.js.map index 14bf515..32b9aab 100644 --- a/dist/tipagemRotas.js.map +++ b/dist/tipagemRotas.js.map @@ -1 +1 @@ -{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAEH,MAAa,YAAY;IAGvB;;OAEG;IACH,YAAY,GAAG,QAAkB;QALjC,mBAAc,GAAa,EAAE,CAAA;QAM3B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,MAAM,CAAC,OAAO,CAAC;iBACZ,KAAK,CAAC,GAAG,CAAC;iBACV,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjB,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACjC,CAAC;YACH,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;OAGG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;IAC5C,CAAC;IACD;;;;UAIM;IACN,IAAI,OAAO,CAAC,cAAsB;QAChC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;IAC1E,CAAC;IAED;;;OAGG;IAEH,QAAQ,CAAC,KAAQ,EAAE,YAAsB;QACvC,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAC1E,CAAA;QAED,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAA;QAE3B,GAAG,CAAC,MAAM,GAAG,EAAE,CAAA;QAEf,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAEvC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,SAAS,EAAE,CAAC;YACrC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;QAC1C,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAA;YAC3B,GAAG,CAAC,MAAM,GAAG,EAAE,CAAA;QACjB,CAAC;QAED,OAAO,GAAG,CAAC,IAAI,CAAA;IACjB,CAAC;IAED;;;OAGG;IACH,EAAE,CAAC,KAAQ;QACT,IAAI,OAAO,MAAM,IAAI,WAAW,EAAE,CAAC;YACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;IAED;;;OAGG;IAEH,IAAI,UAAU;QACZ,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAC1E,CAAA;QACD,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAA;QAC9B,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QAEpD,aAAa;QACb,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACrB,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAChC,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAC7C,CAAA;YACD,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,OAAO,EAAO,CAAA;QACzC,CAAC;QAED,OAAO,QAAsB,CAAA;IAC/B,CAAC;CACF;AA/FD,oCA+FC"} \ No newline at end of file +{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAEH,MAAa,YAAY;IAGvB;;OAEG;IACH,YAAY,GAAG,QAAkB;QALjC,mBAAc,GAAa,EAAE,CAAA;QAM3B,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,MAAM,CAAC,OAAO,CAAC;iBACZ,KAAK,CAAC,GAAG,CAAC;iBACV,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjB,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;gBACjC,CAAC;YACH,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;OAGG;IACH,IAAI,OAAO;QACT,IAAI,GAAG,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;QAC7C,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAC9B,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QACxB,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;IACD;;;;UAIM;IACN,IAAI,OAAO,CAAC,cAAsB;QAChC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;IAC1E,CAAC;IAED;;;OAGG;IAEH,QAAQ,CAAC,KAAQ,EAAE,YAAsB;QACvC,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAC1E,CAAA;QAED,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAA;QAE3B,GAAG,CAAC,MAAM,GAAG,EAAE,CAAA;QAEf,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAEvC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,SAAS,EAAE,CAAC;YACrC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAA;QAC1C,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAA;YAC3B,GAAG,CAAC,MAAM,GAAG,EAAE,CAAA;QACjB,CAAC;QAED,OAAO,GAAG,CAAC,IAAI,CAAA;IACjB,CAAC;IAED;;;OAGG;IACH,EAAE,CAAC,KAAQ;QACT,IAAI,OAAO,MAAM,IAAI,WAAW,EAAE,CAAC;YACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;IAED;;;OAGG;IAEH,IAAI,UAAU;QACZ,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAC1E,CAAA;QACD,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAA;QAC9B,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QAEpD,aAAa;QACb,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACrB,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAChC,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAC7C,CAAA;YACD,OAAO,EAAE,GAAG,QAAQ,EAAE,GAAG,OAAO,EAAO,CAAA;QACzC,CAAC;QAED,OAAO,QAAsB,CAAA;IAC/B,CAAC;CACF;AApGD,oCAoGC"} \ No newline at end of file diff --git a/package.json b/package.json index 25a878b..7a39cc4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.61.0", + "version": "0.62.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/tipagemRotas.ts b/src/tipagemRotas.ts index c084d74..54b0e5c 100644 --- a/src/tipagemRotas.ts +++ b/src/tipagemRotas.ts @@ -32,7 +32,12 @@ export class TipagemRotas { ** "/caminho" */ get caminho() { - return `/${this._partesCaminho.join("/")}` + let ret = `/${this._partesCaminho.join("/")}` + ret = ret.replace(/\/+/g, "/") + if (ret.length > 1 && ret.endsWith("/")) { + ret = ret.slice(0, -1) + } + return ret } /** Define o caminho completo da rota ** mCaminho.caminho = "/novoCaminho" From bcab231e47bfc45d34c7e6f6df821c12b03dea3b Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 9 Dec 2024 10:57:51 -0300 Subject: [PATCH 35/76] =?UTF-8?q?atualiza=C3=A7=C3=A3o=20de=20vers=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 8 +++----- pnpm-lock.yaml | 12 ++++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 7a39cc4..9dfdf1f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.62.0", + "version": "0.65.0", "description": "", "main": "dist/index.js", "scripts": { @@ -19,9 +19,7 @@ }, "devDependencies": { "@biomejs/biome": "^1.9.4", - "@types/node": "^20.16.10" - }, - "peerDependencies": { - "typescript": "5.6.2" + "@types/node": "^20.16.10", + "typescript": "^5.7.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1fc3295..917106d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,9 +8,6 @@ importers: .: dependencies: - typescript: - specifier: 5.6.2 - version: 5.6.2 zod: specifier: 3.23.8 version: 3.23.8 @@ -21,6 +18,9 @@ importers: '@types/node': specifier: ^20.16.10 version: 20.16.10 + typescript: + specifier: ^5.7.2 + version: 5.7.2 packages: @@ -80,8 +80,8 @@ packages: '@types/node@20.16.10': resolution: {integrity: sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==} - typescript@5.6.2: - resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} + typescript@5.7.2: + resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==} engines: {node: '>=14.17'} hasBin: true @@ -132,7 +132,7 @@ snapshots: dependencies: undici-types: 6.19.8 - typescript@5.6.2: {} + typescript@5.7.2: {} undici-types@6.19.8: {} From 773013d97f9c448c751f7311606e322d38514c94 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sun, 26 Jan 2025 09:07:26 -0300 Subject: [PATCH 36/76] build --- dist/tipagemRotas.js | 1 + dist/tipagemRotas.js.map | 2 +- package.json | 4 ++-- src/tipagemRotas.ts | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dist/tipagemRotas.js b/dist/tipagemRotas.js index 98bcab9..df84a3e 100644 --- a/dist/tipagemRotas.js +++ b/dist/tipagemRotas.js @@ -59,6 +59,7 @@ class TipagemRotas { for (const [key, value] of queryKeys) { url.searchParams.set(String(key), value); } + url.hash = ""; if (usarComoHash) { url.hash = `#${url.search}`; url.search = ""; diff --git a/dist/tipagemRotas.js.map b/dist/tipagemRotas.js.map index 32b9aab..976de73 100644 --- a/dist/tipagemRotas.js.map +++ b/dist/tipagemRotas.js.map @@ -1 +1 @@ -{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 9dfdf1f..08a4d40 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.65.0", + "version": "0.66.0", "description": "", "main": "dist/index.js", "scripts": { @@ -15,7 +15,7 @@ }, "license": "ISC", "dependencies": { - "zod": "3.23.8" + "zod": "3.24.1" }, "devDependencies": { "@biomejs/biome": "^1.9.4", diff --git a/src/tipagemRotas.ts b/src/tipagemRotas.ts index 54b0e5c..49c203f 100644 --- a/src/tipagemRotas.ts +++ b/src/tipagemRotas.ts @@ -68,6 +68,8 @@ export class TipagemRotas { url.searchParams.set(String(key), value) } + url.hash = "" + if (usarComoHash) { url.hash = `#${url.search}` url.search = "" From 68407e24abc02121ef1534cdd30c5856c3578284 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Thu, 30 Jan 2025 23:16:19 -0300 Subject: [PATCH 37/76] build --- dist/tipagemRotas.js | 2 +- dist/tipagemRotas.js.map | 2 +- package.json | 2 +- src/tipagemRotas.ts | 5 ++++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dist/tipagemRotas.js b/dist/tipagemRotas.js index df84a3e..fa78c21 100644 --- a/dist/tipagemRotas.js +++ b/dist/tipagemRotas.js @@ -57,7 +57,7 @@ class TipagemRotas { url.search = ""; const queryKeys = Object.entries(query); for (const [key, value] of queryKeys) { - url.searchParams.set(String(key), value); + url.searchParams.set(String(key), value === undefined || value === null ? "" : value); } url.hash = ""; if (usarComoHash) { diff --git a/dist/tipagemRotas.js.map b/dist/tipagemRotas.js.map index 976de73..69b80c6 100644 --- a/dist/tipagemRotas.js.map +++ b/dist/tipagemRotas.js.map @@ -1 +1 @@ -{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 08a4d40..13706ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.66.0", + "version": "0.67.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/tipagemRotas.ts b/src/tipagemRotas.ts index 49c203f..dec98b9 100644 --- a/src/tipagemRotas.ts +++ b/src/tipagemRotas.ts @@ -65,7 +65,10 @@ export class TipagemRotas { const queryKeys = Object.entries(query) for (const [key, value] of queryKeys) { - url.searchParams.set(String(key), value) + url.searchParams.set( + String(key), + value === undefined || value === null ? "" : value, + ) } url.hash = "" From d4df9ec5322794b6067f43268864fbfbccfd56f1 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sat, 1 Feb 2025 16:55:15 -0300 Subject: [PATCH 38/76] build --- dist/index.d.ts | 1 - dist/index.js | 1 - dist/index.js.map | 2 +- dist/provedores.d.ts | 4 ---- dist/provedores.js | 9 --------- dist/provedores.js.map | 1 - package.json | 2 +- src/index.ts | 1 - src/provedores.ts | 4 ---- 9 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 dist/provedores.d.ts delete mode 100644 dist/provedores.js delete mode 100644 dist/provedores.js.map delete mode 100644 src/provedores.ts diff --git a/dist/index.d.ts b/dist/index.d.ts index 29c518b..df34183 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -4,7 +4,6 @@ export * from "./aleatorio"; export * from "./texto_busca"; export * from "./unidades_medida"; export * from "./uuid"; -export * from "./provedores"; export * from "./ecosistema"; export * from "./variaveisComuns"; export * from "./tipagemRotas"; diff --git a/dist/index.js b/dist/index.js index ab35209..9b5bc03 100644 --- a/dist/index.js +++ b/dist/index.js @@ -20,7 +20,6 @@ __exportStar(require("./aleatorio"), exports); __exportStar(require("./texto_busca"), exports); __exportStar(require("./unidades_medida"), exports); __exportStar(require("./uuid"), exports); -__exportStar(require("./provedores"), exports); __exportStar(require("./ecosistema"), exports); __exportStar(require("./variaveisComuns"), exports); __exportStar(require("./tipagemRotas"), exports); diff --git a/dist/index.js.map b/dist/index.js.map index b2ebbfc..c452059 100644 --- a/dist/index.js.map +++ b/dist/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,6CAA0B;AAC1B,8CAA2B;AAC3B,gDAA6B;AAC7B,oDAAiC;AACjC,yCAAsB;AACtB,+CAA4B;AAC5B,+CAA4B;AAC5B,oDAAiC;AACjC,iDAA8B;AAC9B,8CAA2B"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,6CAA0B;AAC1B,8CAA2B;AAC3B,gDAA6B;AAC7B,oDAAiC;AACjC,yCAAsB;AACtB,+CAA4B;AAC5B,oDAAiC;AACjC,iDAA8B;AAC9B,8CAA2B"} \ No newline at end of file diff --git a/dist/provedores.d.ts b/dist/provedores.d.ts deleted file mode 100644 index e350450..0000000 --- a/dist/provedores.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare enum provedores { - "betha-sistemas" = "Betha Sistemas", - "e-licencie" = "e-licencie" -} diff --git a/dist/provedores.js b/dist/provedores.js deleted file mode 100644 index 121a02c..0000000 --- a/dist/provedores.js +++ /dev/null @@ -1,9 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.provedores = void 0; -var provedores; -(function (provedores) { - provedores["betha-sistemas"] = "Betha Sistemas"; - provedores["e-licencie"] = "e-licencie"; -})(provedores || (exports.provedores = provedores = {})); -//# sourceMappingURL=provedores.js.map \ No newline at end of file diff --git a/dist/provedores.js.map b/dist/provedores.js.map deleted file mode 100644 index ebf3644..0000000 --- a/dist/provedores.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"provedores.js","sourceRoot":"","sources":["../src/provedores.ts"],"names":[],"mappings":";;;AAAA,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,+CAAmC,CAAA;IACnC,uCAA2B,CAAA;AAC7B,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB"} \ No newline at end of file diff --git a/package.json b/package.json index 13706ba..c4bde75 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.67.0", + "version": "0.69.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/index.ts b/src/index.ts index f8d7453..fe1c614 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,7 +4,6 @@ export * from "./aleatorio" export * from "./texto_busca" export * from "./unidades_medida" export * from "./uuid" -export * from "./provedores" export * from "./ecosistema" export * from "./variaveisComuns" export * from "./tipagemRotas" diff --git a/src/provedores.ts b/src/provedores.ts deleted file mode 100644 index 128c7f4..0000000 --- a/src/provedores.ts +++ /dev/null @@ -1,4 +0,0 @@ -export enum provedores { - "betha-sistemas" = "Betha Sistemas", - "e-licencie" = "e-licencie", -} From 745c04819b53be860925f31063ebc31aa54eda0c Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sun, 16 Feb 2025 18:17:35 -0300 Subject: [PATCH 39/76] . --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c4bde75..2d59874 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.69.0", + "version": "0.70.0", "description": "", "main": "dist/index.js", "scripts": { From 3c8aa13a5ed12a2907df05d756a1be054cb71d8d Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Fri, 21 Feb 2025 14:37:06 -0300 Subject: [PATCH 40/76] =?UTF-8?q?adicionado=20integra=C3=A7=C3=A3o=20com?= =?UTF-8?q?=20loki?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/index.d.ts | 1 + dist/index.js | 1 + dist/index.js.map | 2 +- dist/logger.d.ts | 15 ++++++++++ dist/logger.js | 51 +++++++++++++++++++++++++++++++++ dist/logger.js.map | 1 + dist/teste.d.ts | 1 + dist/teste.js | 5 ++++ dist/teste.js.map | 1 + package.json | 3 +- pnpm-lock.yaml | 53 ++++++++++++++++++++++++++++++---- src/index.ts | 1 + src/logger.ts | 71 ++++++++++++++++++++++++++++++++++++++++++++++ src/teste.ts | 3 ++ 14 files changed, 202 insertions(+), 7 deletions(-) create mode 100644 dist/logger.d.ts create mode 100644 dist/logger.js create mode 100644 dist/logger.js.map create mode 100644 dist/teste.d.ts create mode 100644 dist/teste.js create mode 100644 dist/teste.js.map create mode 100644 src/logger.ts create mode 100644 src/teste.ts diff --git a/dist/index.d.ts b/dist/index.d.ts index df34183..a769ea5 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -8,3 +8,4 @@ export * from "./ecosistema"; export * from "./variaveisComuns"; export * from "./tipagemRotas"; export * from "./extensoes"; +export * from "./logger"; diff --git a/dist/index.js b/dist/index.js index 9b5bc03..423a81d 100644 --- a/dist/index.js +++ b/dist/index.js @@ -24,4 +24,5 @@ __exportStar(require("./ecosistema"), exports); __exportStar(require("./variaveisComuns"), exports); __exportStar(require("./tipagemRotas"), exports); __exportStar(require("./extensoes"), exports); +__exportStar(require("./logger"), exports); //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/index.js.map b/dist/index.js.map index c452059..a1b2649 100644 --- a/dist/index.js.map +++ b/dist/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,6CAA0B;AAC1B,8CAA2B;AAC3B,gDAA6B;AAC7B,oDAAiC;AACjC,yCAAsB;AACtB,+CAA4B;AAC5B,oDAAiC;AACjC,iDAA8B;AAC9B,8CAA2B"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,6CAA0B;AAC1B,8CAA2B;AAC3B,gDAA6B;AAC7B,oDAAiC;AACjC,yCAAsB;AACtB,+CAA4B;AAC5B,oDAAiC;AACjC,iDAA8B;AAC9B,8CAA2B;AAC3B,2CAAwB"} \ No newline at end of file diff --git a/dist/logger.d.ts b/dist/logger.d.ts new file mode 100644 index 0000000..4f2e380 --- /dev/null +++ b/dist/logger.d.ts @@ -0,0 +1,15 @@ +interface LogOptions { + app?: string; + conta?: string; + usuario?: string; + detalhes?: unknown[]; +} +export declare const logger: { + /** 🟢 Informação geral */ + info: (message: string, options?: LogOptions) => Promise; + /** 🟡 Aviso/atenção necessária */ + warn: (message: string, options?: LogOptions) => Promise; + /** 🔴 Erro crítico na execução */ + error: (message: string, options?: LogOptions) => Promise; +}; +export {}; diff --git a/dist/logger.js b/dist/logger.js new file mode 100644 index 0000000..7c80ace --- /dev/null +++ b/dist/logger.js @@ -0,0 +1,51 @@ +"use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.logger = void 0; +const cross_fetch_1 = __importDefault(require("cross-fetch")); +const LOKI_BASE_URL = "https://log.idz.one"; +const LOKI_ENDPOINT = "/loki/api/v1/push"; +const createLogger = (level) => { + const sendToLoki = async (message, options = {}) => { + const { app, conta, usuario, detalhes = [] } = options; + const timestamp = `${Date.now()}000000`; + try { + // Formata a linha de log principal + const mainLog = detalhes.length > 0 + ? `${message} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + : message; + const payload = { + stream: { app, conta, usuario, level }, + values: [ + [ + timestamp, + mainLog, // Linha de log direta + ], + ], + }; + const response = await (0, cross_fetch_1.default)(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ streams: [payload] }), + }); + if (!response.ok) { + throw new Error(`Erro ${response.status}: ${await response.text()}`); + } + } + catch (error) { + console.error("[Logger] Falha no envio:", error); + } + }; + return sendToLoki; +}; +exports.logger = { + /** 🟢 Informação geral */ + info: createLogger("info"), + /** 🟡 Aviso/atenção necessária */ + warn: createLogger("warn"), + /** 🔴 Erro crítico na execução */ + error: createLogger("error"), +}; +//# sourceMappingURL=logger.js.map \ No newline at end of file diff --git a/dist/logger.js.map b/dist/logger.js.map new file mode 100644 index 0000000..de04e87 --- /dev/null +++ b/dist/logger.js.map @@ -0,0 +1 @@ +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AAEpC,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAqBzC,MAAM,YAAY,GAAG,CAAC,KAAe,EAAE,EAAE;IACvC,MAAM,UAAU,GAAG,KAAK,EAAE,OAAe,EAAE,UAAsB,EAAE,EAAE,EAAE;QACrE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,OAAO,CAAA;QACtD,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,IAAI,CAAC;YACH,mCAAmC;YACnC,MAAM,OAAO,GACX,QAAQ,CAAC,MAAM,GAAG,CAAC;gBACjB,CAAC,CAAC,GAAG,OAAO,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACpE,CAAC,CAAC,OAAO,CAAA;YAEb,MAAM,OAAO,GAAe;gBAC1B,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE;gBACtC,MAAM,EAAE;oBACN;wBACE,SAAS;wBACT,OAAO,EAAE,sBAAsB;qBAChC;iBACF;aACF,CAAA;YAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;gBACpE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;aAC7C,CAAC,CAAA;YAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YACtE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;QAClD,CAAC;IACH,CAAC,CAAA;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,0BAA0B;IAC1B,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;IAC1B,kCAAkC;IAClC,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;IAC1B,kCAAkC;IAClC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;CAC7B,CAAA"} \ No newline at end of file diff --git a/dist/teste.d.ts b/dist/teste.d.ts new file mode 100644 index 0000000..cb0ff5c --- /dev/null +++ b/dist/teste.d.ts @@ -0,0 +1 @@ +export {}; diff --git a/dist/teste.js b/dist/teste.js new file mode 100644 index 0000000..ddcaafe --- /dev/null +++ b/dist/teste.js @@ -0,0 +1,5 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const logger_1 = require("./logger"); +logger_1.logger.error("Esse é um erro", { app: "teste" }); +//# sourceMappingURL=teste.js.map \ No newline at end of file diff --git a/dist/teste.js.map b/dist/teste.js.map new file mode 100644 index 0000000..629572e --- /dev/null +++ b/dist/teste.js.map @@ -0,0 +1 @@ +{"version":3,"file":"teste.js","sourceRoot":"","sources":["../src/teste.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,eAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAA"} \ No newline at end of file diff --git a/package.json b/package.json index 2d59874..b0a749e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.70.0", + "version": "0.72.0", "description": "", "main": "dist/index.js", "scripts": { @@ -15,6 +15,7 @@ }, "license": "ISC", "dependencies": { + "cross-fetch": "^4.1.0", "zod": "3.24.1" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 917106d..677017c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,9 +8,12 @@ importers: .: dependencies: + cross-fetch: + specifier: ^4.1.0 + version: 4.1.0 zod: - specifier: 3.23.8 - version: 3.23.8 + specifier: 3.24.1 + version: 3.24.1 devDependencies: '@biomejs/biome': specifier: ^1.9.4 @@ -80,6 +83,21 @@ packages: '@types/node@20.16.10': resolution: {integrity: sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==} + cross-fetch@4.1.0: + resolution: {integrity: sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw==} + + node-fetch@2.7.0: + resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==} + engines: {node: 4.x || >=6.0.0} + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + + tr46@0.0.3: + resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} + typescript@5.7.2: resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==} engines: {node: '>=14.17'} @@ -88,8 +106,14 @@ packages: undici-types@6.19.8: resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} - zod@3.23.8: - resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} + webidl-conversions@3.0.1: + resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} + + whatwg-url@5.0.0: + resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} + + zod@3.24.1: + resolution: {integrity: sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==} snapshots: @@ -132,8 +156,27 @@ snapshots: dependencies: undici-types: 6.19.8 + cross-fetch@4.1.0: + dependencies: + node-fetch: 2.7.0 + transitivePeerDependencies: + - encoding + + node-fetch@2.7.0: + dependencies: + whatwg-url: 5.0.0 + + tr46@0.0.3: {} + typescript@5.7.2: {} undici-types@6.19.8: {} - zod@3.23.8: {} + webidl-conversions@3.0.1: {} + + whatwg-url@5.0.0: + dependencies: + tr46: 0.0.3 + webidl-conversions: 3.0.1 + + zod@3.24.1: {} diff --git a/src/index.ts b/src/index.ts index fe1c614..743bb1d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -8,3 +8,4 @@ export * from "./ecosistema" export * from "./variaveisComuns" export * from "./tipagemRotas" export * from "./extensoes" +export * from "./logger" diff --git a/src/logger.ts b/src/logger.ts new file mode 100644 index 0000000..02c2db8 --- /dev/null +++ b/src/logger.ts @@ -0,0 +1,71 @@ +import crossFetch from "cross-fetch" + +const LOKI_BASE_URL = "https://log.idz.one" +const LOKI_ENDPOINT = "/loki/api/v1/push" + +type LogLevel = "info" | "warn" | "error" + +interface LogOptions { + app?: string + conta?: string + usuario?: string + detalhes?: unknown[] +} + +interface LokiStream { + stream: { + app?: string + conta?: string + usuario?: string + level: LogLevel + } + values: Array<[string, string]> +} + +const createLogger = (level: LogLevel) => { + const sendToLoki = async (message: string, options: LogOptions = {}) => { + const { app, conta, usuario, detalhes = [] } = options + const timestamp = `${Date.now()}000000` + + try { + // Formata a linha de log principal + const mainLog = + detalhes.length > 0 + ? `${message} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + : message + + const payload: LokiStream = { + stream: { app, conta, usuario, level }, + values: [ + [ + timestamp, + mainLog, // Linha de log direta + ], + ], + } + + const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ streams: [payload] }), + }) + + if (!response.ok) { + throw new Error(`Erro ${response.status}: ${await response.text()}`) + } + } catch (error) { + console.error("[Logger] Falha no envio:", error) + } + } + + return sendToLoki +} + +export const logger = { + /** 🟢 Informação geral */ + info: createLogger("info"), + /** 🟡 Aviso/atenção necessária */ + warn: createLogger("warn"), + /** 🔴 Erro crítico na execução */ + error: createLogger("error"), +} diff --git a/src/teste.ts b/src/teste.ts new file mode 100644 index 0000000..7bb4100 --- /dev/null +++ b/src/teste.ts @@ -0,0 +1,3 @@ +import { logger } from "./logger" + +logger.error("Esse é um erro", { app: "teste" }) From b5f932ab330291df65770465af54305aefd65202 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Fri, 21 Feb 2025 15:11:01 -0300 Subject: [PATCH 41/76] build --- dist/logger.d.ts | 7 ++++--- dist/logger.js | 10 +++++++--- dist/logger.js.map | 2 +- dist/teste.js | 2 +- dist/teste.js.map | 2 +- package.json | 2 +- src/logger.ts | 12 +++++++++--- src/teste.ts | 2 +- 8 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index 4f2e380..dce339f 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -3,13 +3,14 @@ interface LogOptions { conta?: string; usuario?: string; detalhes?: unknown[]; + eProdicao: boolean; } export declare const logger: { /** 🟢 Informação geral */ - info: (message: string, options?: LogOptions) => Promise; + info: (mensagem: string, options: LogOptions) => Promise; /** 🟡 Aviso/atenção necessária */ - warn: (message: string, options?: LogOptions) => Promise; + warn: (mensagem: string, options: LogOptions) => Promise; /** 🔴 Erro crítico na execução */ - error: (message: string, options?: LogOptions) => Promise; + error: (mensagem: string, options: LogOptions) => Promise; }; export {}; diff --git a/dist/logger.js b/dist/logger.js index 7c80ace..1ee28fd 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -8,14 +8,18 @@ const cross_fetch_1 = __importDefault(require("cross-fetch")); const LOKI_BASE_URL = "https://log.idz.one"; const LOKI_ENDPOINT = "/loki/api/v1/push"; const createLogger = (level) => { - const sendToLoki = async (message, options = {}) => { + const sendToLoki = async (mensagem, options) => { + if (!options.eProdicao) { + console.log(level, mensagem, options); + return; + } const { app, conta, usuario, detalhes = [] } = options; const timestamp = `${Date.now()}000000`; try { // Formata a linha de log principal const mainLog = detalhes.length > 0 - ? `${message} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` - : message; + ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + : mensagem; const payload = { stream: { app, conta, usuario, level }, values: [ diff --git a/dist/logger.js.map b/dist/logger.js.map index de04e87..722a6bf 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AAEpC,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAqBzC,MAAM,YAAY,GAAG,CAAC,KAAe,EAAE,EAAE;IACvC,MAAM,UAAU,GAAG,KAAK,EAAE,OAAe,EAAE,UAAsB,EAAE,EAAE,EAAE;QACrE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,OAAO,CAAA;QACtD,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,IAAI,CAAC;YACH,mCAAmC;YACnC,MAAM,OAAO,GACX,QAAQ,CAAC,MAAM,GAAG,CAAC;gBACjB,CAAC,CAAC,GAAG,OAAO,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACpE,CAAC,CAAC,OAAO,CAAA;YAEb,MAAM,OAAO,GAAe;gBAC1B,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE;gBACtC,MAAM,EAAE;oBACN;wBACE,SAAS;wBACT,OAAO,EAAE,sBAAsB;qBAChC;iBACF;aACF,CAAA;YAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;gBACpE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;aAC7C,CAAC,CAAA;YAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YACtE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;QAClD,CAAC;IACH,CAAC,CAAA;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,0BAA0B;IAC1B,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;IAC1B,kCAAkC;IAClC,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;IAC1B,kCAAkC;IAClC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;CAC7B,CAAA"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AAEpC,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAsBzC,MAAM,YAAY,GAAG,CAAC,KAAe,EAAE,EAAE;IACvC,MAAM,UAAU,GAAG,KAAK,EAAE,QAAgB,EAAE,OAAmB,EAAE,EAAE;QACjE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;YACrC,OAAM;QACR,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,OAAO,CAAA;QACtD,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,IAAI,CAAC;YACH,mCAAmC;YACnC,MAAM,OAAO,GACX,QAAQ,CAAC,MAAM,GAAG,CAAC;gBACjB,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACrE,CAAC,CAAC,QAAQ,CAAA;YAEd,MAAM,OAAO,GAAe;gBAC1B,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE;gBACtC,MAAM,EAAE;oBACN;wBACE,SAAS;wBACT,OAAO,EAAE,sBAAsB;qBAChC;iBACF;aACF,CAAA;YAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;gBACpE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;aAC7C,CAAC,CAAA;YAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YACtE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;QAClD,CAAC;IACH,CAAC,CAAA;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,0BAA0B;IAC1B,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;IAC1B,kCAAkC;IAClC,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;IAC1B,kCAAkC;IAClC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;CAC7B,CAAA"} \ No newline at end of file diff --git a/dist/teste.js b/dist/teste.js index ddcaafe..345ee91 100644 --- a/dist/teste.js +++ b/dist/teste.js @@ -1,5 +1,5 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const logger_1 = require("./logger"); -logger_1.logger.error("Esse é um erro", { app: "teste" }); +logger_1.logger.error("Esse é um erro", { app: "teste", eProdicao: true }); //# sourceMappingURL=teste.js.map \ No newline at end of file diff --git a/dist/teste.js.map b/dist/teste.js.map index 629572e..d623c38 100644 --- a/dist/teste.js.map +++ b/dist/teste.js.map @@ -1 +1 @@ -{"version":3,"file":"teste.js","sourceRoot":"","sources":["../src/teste.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,eAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAA"} \ No newline at end of file +{"version":3,"file":"teste.js","sourceRoot":"","sources":["../src/teste.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,eAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA"} \ No newline at end of file diff --git a/package.json b/package.json index b0a749e..77aeee3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.72.0", + "version": "0.73.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index 02c2db8..cc3b7bb 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -10,6 +10,7 @@ interface LogOptions { conta?: string usuario?: string detalhes?: unknown[] + eProdicao: boolean } interface LokiStream { @@ -23,7 +24,12 @@ interface LokiStream { } const createLogger = (level: LogLevel) => { - const sendToLoki = async (message: string, options: LogOptions = {}) => { + const sendToLoki = async (mensagem: string, options: LogOptions) => { + if (!options.eProdicao) { + console.log(level, mensagem, options) + return + } + const { app, conta, usuario, detalhes = [] } = options const timestamp = `${Date.now()}000000` @@ -31,8 +37,8 @@ const createLogger = (level: LogLevel) => { // Formata a linha de log principal const mainLog = detalhes.length > 0 - ? `${message} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` - : message + ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + : mensagem const payload: LokiStream = { stream: { app, conta, usuario, level }, diff --git a/src/teste.ts b/src/teste.ts index 7bb4100..383f707 100644 --- a/src/teste.ts +++ b/src/teste.ts @@ -1,3 +1,3 @@ import { logger } from "./logger" -logger.error("Esse é um erro", { app: "teste" }) +logger.error("Esse é um erro", { app: "teste", eProdicao: true }) From 92ffd22f7987290a6defb5ff8429bc1af386975d Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Fri, 21 Feb 2025 15:18:56 -0300 Subject: [PATCH 42/76] build --- dist/logger.d.ts | 2 +- dist/logger.js | 2 +- dist/teste.js | 2 +- package.json | 2 +- src/logger.ts | 4 ++-- src/teste.ts | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index dce339f..febf9dc 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -3,7 +3,7 @@ interface LogOptions { conta?: string; usuario?: string; detalhes?: unknown[]; - eProdicao: boolean; + eProducao: boolean; } export declare const logger: { /** 🟢 Informação geral */ diff --git a/dist/logger.js b/dist/logger.js index 1ee28fd..679c3ed 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -9,7 +9,7 @@ const LOKI_BASE_URL = "https://log.idz.one"; const LOKI_ENDPOINT = "/loki/api/v1/push"; const createLogger = (level) => { const sendToLoki = async (mensagem, options) => { - if (!options.eProdicao) { + if (!options.eProducao) { console.log(level, mensagem, options); return; } diff --git a/dist/teste.js b/dist/teste.js index 345ee91..501c537 100644 --- a/dist/teste.js +++ b/dist/teste.js @@ -1,5 +1,5 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const logger_1 = require("./logger"); -logger_1.logger.error("Esse é um erro", { app: "teste", eProdicao: true }); +logger_1.logger.error("Esse é um erro", { app: "teste", eProducao: true }); //# sourceMappingURL=teste.js.map \ No newline at end of file diff --git a/package.json b/package.json index 77aeee3..90751a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.73.0", + "version": "0.75.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index cc3b7bb..13741cc 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -10,7 +10,7 @@ interface LogOptions { conta?: string usuario?: string detalhes?: unknown[] - eProdicao: boolean + eProducao: boolean } interface LokiStream { @@ -25,7 +25,7 @@ interface LokiStream { const createLogger = (level: LogLevel) => { const sendToLoki = async (mensagem: string, options: LogOptions) => { - if (!options.eProdicao) { + if (!options.eProducao) { console.log(level, mensagem, options) return } diff --git a/src/teste.ts b/src/teste.ts index 383f707..d707e81 100644 --- a/src/teste.ts +++ b/src/teste.ts @@ -1,3 +1,3 @@ import { logger } from "./logger" -logger.error("Esse é um erro", { app: "teste", eProdicao: true }) +logger.error("Esse é um erro", { app: "teste", eProducao: true }) From 658a8abaebb5707594b28dd2af7cb6a941ee59d0 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Fri, 21 Feb 2025 17:20:13 -0300 Subject: [PATCH 43/76] . --- dist/logger.d.ts | 26 ++++++++-------- dist/logger.js | 71 ++++++++++++++++++++------------------------ dist/logger.js.map | 2 +- dist/teste.js | 9 +++++- dist/teste.js.map | 2 +- package.json | 2 +- src/logger.ts | 74 +++++++++++++++++++--------------------------- src/teste.ts | 10 ++++++- 8 files changed, 96 insertions(+), 100 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index febf9dc..76bef18 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -1,16 +1,16 @@ -interface LogOptions { - app?: string; - conta?: string; - usuario?: string; - detalhes?: unknown[]; +type tipoAmb = { + app: string; + inquilino: string; + usuario: string; eProducao: boolean; -} -export declare const logger: { - /** 🟢 Informação geral */ - info: (mensagem: string, options: LogOptions) => Promise; - /** 🟡 Aviso/atenção necessária */ - warn: (mensagem: string, options: LogOptions) => Promise; - /** 🔴 Erro crítico na execução */ - error: (mensagem: string, options: LogOptions) => Promise; +}; +type tipoLog = { + detalhes?: unknown[]; + __filename?: string; +}; +export declare const logger: ({ inquilino, app, eProducao, usuario }: tipoAmb) => { + info: (mensagem: string, op_tipoLog?: tipoLog) => Promise; + warn: (mensagem: string, op_tipoLog?: tipoLog) => Promise; + error: (mensagem: string, op_tipoLog?: tipoLog) => Promise; }; export {}; diff --git a/dist/logger.js b/dist/logger.js index 679c3ed..b0f9321 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -7,49 +7,42 @@ exports.logger = void 0; const cross_fetch_1 = __importDefault(require("cross-fetch")); const LOKI_BASE_URL = "https://log.idz.one"; const LOKI_ENDPOINT = "/loki/api/v1/push"; -const createLogger = (level) => { - const sendToLoki = async (mensagem, options) => { - if (!options.eProducao) { - console.log(level, mensagem, options); - return; +const logger = ({ inquilino, app, eProducao, usuario }) => { + const f = (level) => async (mensagem, op_tipoLog) => { + let { __filename, detalhes } = op_tipoLog || {}; + if (!eProducao) { + app = `DEV-${app}`; + } + if (__filename && typeof process != "undefined" && process.cwd()) { + __filename = __filename.replace(process.cwd(), ""); } - const { app, conta, usuario, detalhes = [] } = options; const timestamp = `${Date.now()}000000`; - try { - // Formata a linha de log principal - const mainLog = detalhes.length > 0 - ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` - : mensagem; - const payload = { - stream: { app, conta, usuario, level }, - values: [ - [ - timestamp, - mainLog, // Linha de log direta - ], + const mainLog = detalhes?.length + ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + : mensagem; + const payload = { + stream: { app, inquilino, usuario, level }, + values: [ + [ + timestamp, + mainLog, // Linha de log direta ], - }; - const response = await (0, cross_fetch_1.default)(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ streams: [payload] }), - }); - if (!response.ok) { - throw new Error(`Erro ${response.status}: ${await response.text()}`); - } - } - catch (error) { - console.error("[Logger] Falha no envio:", error); + ], + }; + const response = await (0, cross_fetch_1.default)(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ streams: [payload] }), + }); + if (!response.ok) { + throw new Error(`Erro ${response.status}: ${await response.text()}`); } }; - return sendToLoki; -}; -exports.logger = { - /** 🟢 Informação geral */ - info: createLogger("info"), - /** 🟡 Aviso/atenção necessária */ - warn: createLogger("warn"), - /** 🔴 Erro crítico na execução */ - error: createLogger("error"), + return { + info: f("info"), + warn: f("warn"), + error: f("error"), + }; }; +exports.logger = logger; //# sourceMappingURL=logger.js.map \ No newline at end of file diff --git a/dist/logger.js.map b/dist/logger.js.map index 722a6bf..08fe8ef 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AAEpC,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAsBzC,MAAM,YAAY,GAAG,CAAC,KAAe,EAAE,EAAE;IACvC,MAAM,UAAU,GAAG,KAAK,EAAE,QAAgB,EAAE,OAAmB,EAAE,EAAE;QACjE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;YACrC,OAAM;QACR,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,OAAO,CAAA;QACtD,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,IAAI,CAAC;YACH,mCAAmC;YACnC,MAAM,OAAO,GACX,QAAQ,CAAC,MAAM,GAAG,CAAC;gBACjB,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACrE,CAAC,CAAC,QAAQ,CAAA;YAEd,MAAM,OAAO,GAAe;gBAC1B,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE;gBACtC,MAAM,EAAE;oBACN;wBACE,SAAS;wBACT,OAAO,EAAE,sBAAsB;qBAChC;iBACF;aACF,CAAA;YAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;gBACpE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;aAC7C,CAAC,CAAA;YAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YACtE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;QAClD,CAAC;IACH,CAAC,CAAA;IAED,OAAO,UAAU,CAAA;AACnB,CAAC,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,0BAA0B;IAC1B,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;IAC1B,kCAAkC;IAClC,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC;IAC1B,kCAAkC;IAClC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;CAC7B,CAAA"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AAEpC,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAgBlC,MAAM,MAAM,GAAG,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAW,EAAE,EAAE;IACxE,MAAM,CAAC,GACL,CAAC,KAAgB,EAAE,EAAE,CAAC,KAAK,EAAE,QAAgB,EAAE,UAAoB,EAAE,EAAE;QACrE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;QAE/C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;QACpB,CAAC;QAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC;QAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;YAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACrE,CAAC,CAAC,QAAQ,CAAA;QAEZ,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YAC1C,MAAM,EAAE;gBACN;oBACE,SAAS;oBACT,OAAO,EAAE,sBAAsB;iBAChC;aACF;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;YACpE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC7C,CAAC,CAAA;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC,CAAA;IAEH,OAAO;QACL,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;KAClB,CAAA;AACH,CAAC,CAAA;AA7CY,QAAA,MAAM,UA6ClB"} \ No newline at end of file diff --git a/dist/teste.js b/dist/teste.js index 501c537..90f9785 100644 --- a/dist/teste.js +++ b/dist/teste.js @@ -1,5 +1,12 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const logger_1 = require("./logger"); -logger_1.logger.error("Esse é um erro", { app: "teste", eProducao: true }); +const { error, info } = (0, logger_1.logger)({ + inquilino: "conta_1", + app: "teste", + eProducao: true, + usuario: "pedrinho", +}); +error("Deu Ruim"); +info("Deu Bom", { __filename }); //# sourceMappingURL=teste.js.map \ No newline at end of file diff --git a/dist/teste.js.map b/dist/teste.js.map index d623c38..49fb983 100644 --- a/dist/teste.js.map +++ b/dist/teste.js.map @@ -1 +1 @@ -{"version":3,"file":"teste.js","sourceRoot":"","sources":["../src/teste.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,eAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA"} \ No newline at end of file +{"version":3,"file":"teste.js","sourceRoot":"","sources":["../src/teste.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAA,eAAM,EAAC;IAC7B,SAAS,EAAE,SAAS;IACpB,GAAG,EAAE,OAAO;IACZ,SAAS,EAAE,IAAI;IACf,OAAO,EAAE,UAAU;CACpB,CAAC,CAAA;AAEF,KAAK,CAAC,UAAU,CAAC,CAAA;AACjB,IAAI,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA"} \ No newline at end of file diff --git a/package.json b/package.json index 90751a3..1b51b45 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.75.0", + "version": "0.76.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index 13741cc..d5f48fa 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -3,45 +3,41 @@ import crossFetch from "cross-fetch" const LOKI_BASE_URL = "https://log.idz.one" const LOKI_ENDPOINT = "/loki/api/v1/push" -type LogLevel = "info" | "warn" | "error" +type tipoLevel = "info" | "warn" | "error" -interface LogOptions { - app?: string - conta?: string - usuario?: string - detalhes?: unknown[] +type tipoAmb = { + app: string + inquilino: string + usuario: string eProducao: boolean } -interface LokiStream { - stream: { - app?: string - conta?: string - usuario?: string - level: LogLevel - } - values: Array<[string, string]> +type tipoLog = { + detalhes?: unknown[] + __filename?: string } -const createLogger = (level: LogLevel) => { - const sendToLoki = async (mensagem: string, options: LogOptions) => { - if (!options.eProducao) { - console.log(level, mensagem, options) - return - } +export const logger = ({ inquilino, app, eProducao, usuario }: tipoAmb) => { + const f = + (level: tipoLevel) => async (mensagem: string, op_tipoLog?: tipoLog) => { + let { __filename, detalhes } = op_tipoLog || {} - const { app, conta, usuario, detalhes = [] } = options - const timestamp = `${Date.now()}000000` + if (!eProducao) { + app = `DEV-${app}` + } - try { - // Formata a linha de log principal - const mainLog = - detalhes.length > 0 - ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` - : mensagem + if (__filename && typeof process != "undefined" && process.cwd()) { + __filename = __filename.replace(process.cwd(), "") + } - const payload: LokiStream = { - stream: { app, conta, usuario, level }, + const timestamp = `${Date.now()}000000` + + const mainLog = detalhes?.length + ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + : mensagem + + const payload = { + stream: { app, inquilino, usuario, level }, values: [ [ timestamp, @@ -59,19 +55,11 @@ const createLogger = (level: LogLevel) => { if (!response.ok) { throw new Error(`Erro ${response.status}: ${await response.text()}`) } - } catch (error) { - console.error("[Logger] Falha no envio:", error) } + + return { + info: f("info"), + warn: f("warn"), + error: f("error"), } - - return sendToLoki -} - -export const logger = { - /** 🟢 Informação geral */ - info: createLogger("info"), - /** 🟡 Aviso/atenção necessária */ - warn: createLogger("warn"), - /** 🔴 Erro crítico na execução */ - error: createLogger("error"), } diff --git a/src/teste.ts b/src/teste.ts index d707e81..2887ac0 100644 --- a/src/teste.ts +++ b/src/teste.ts @@ -1,3 +1,11 @@ import { logger } from "./logger" -logger.error("Esse é um erro", { app: "teste", eProducao: true }) +const { error, info } = logger({ + inquilino: "conta_1", + app: "teste", + eProducao: true, + usuario: "pedrinho", +}) + +error("Deu Ruim") +info("Deu Bom", { __filename }) From decb819207000ae528953e84c20a2c5d33c203dd Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Fri, 21 Feb 2025 17:26:52 -0300 Subject: [PATCH 44/76] . --- dist/logger.d.ts | 7 +++-- dist/logger.js | 2 +- dist/logger.js.map | 2 +- dist/teste.js | 5 ++- dist/teste.js.map | 2 +- package.json | 2 +- src/logger.ts | 76 +++++++++++++++++++++++----------------------- src/teste.ts | 6 ++-- 8 files changed, 51 insertions(+), 51 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index 76bef18..f6b7539 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -1,14 +1,15 @@ type tipoAmb = { - app: string; inquilino: string; usuario: string; - eProducao: boolean; }; type tipoLog = { detalhes?: unknown[]; __filename?: string; }; -export declare const logger: ({ inquilino, app, eProducao, usuario }: tipoAmb) => { +export declare const logger: ({ app, eProducao }: { + app: string; + eProducao: boolean; +}) => ({ inquilino, usuario }: tipoAmb) => { info: (mensagem: string, op_tipoLog?: tipoLog) => Promise; warn: (mensagem: string, op_tipoLog?: tipoLog) => Promise; error: (mensagem: string, op_tipoLog?: tipoLog) => Promise; diff --git a/dist/logger.js b/dist/logger.js index b0f9321..737c6ae 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -7,7 +7,7 @@ exports.logger = void 0; const cross_fetch_1 = __importDefault(require("cross-fetch")); const LOKI_BASE_URL = "https://log.idz.one"; const LOKI_ENDPOINT = "/loki/api/v1/push"; -const logger = ({ inquilino, app, eProducao, usuario }) => { +const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => { const f = (level) => async (mensagem, op_tipoLog) => { let { __filename, detalhes } = op_tipoLog || {}; if (!eProducao) { diff --git a/dist/logger.js.map b/dist/logger.js.map index 08fe8ef..d26ce2c 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AAEpC,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAgBlC,MAAM,MAAM,GAAG,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAW,EAAE,EAAE;IACxE,MAAM,CAAC,GACL,CAAC,KAAgB,EAAE,EAAE,CAAC,KAAK,EAAE,QAAgB,EAAE,UAAoB,EAAE,EAAE;QACrE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;QAE/C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;QACpB,CAAC;QAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC;QAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;YAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACrE,CAAC,CAAC,QAAQ,CAAA;QAEZ,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YAC1C,MAAM,EAAE;gBACN;oBACE,SAAS;oBACT,OAAO,EAAE,sBAAsB;iBAChC;aACF;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;YACpE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC7C,CAAC,CAAA;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC,CAAA;IAEH,OAAO;QACL,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;KAClB,CAAA;AACH,CAAC,CAAA;AA7CY,QAAA,MAAM,UA6ClB"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AAEpC,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAclC,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAW,EAAE,EAAE;IAClC,MAAM,CAAC,GACL,CAAC,KAAgB,EAAE,EAAE,CAAC,KAAK,EAAE,QAAgB,EAAE,UAAoB,EAAE,EAAE;QACrE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;QAE/C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;QACpB,CAAC;QAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC;QAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;YAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACrE,CAAC,CAAC,QAAQ,CAAA;QAEZ,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YAC1C,MAAM,EAAE;gBACN;oBACE,SAAS;oBACT,OAAO,EAAE,sBAAsB;iBAChC;aACF;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;YACpE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC7C,CAAC,CAAA;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC,CAAA;IAEH,OAAO;QACL,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;KAClB,CAAA;AACH,CAAC,CAAA;AA/CU,QAAA,MAAM,UA+ChB"} \ No newline at end of file diff --git a/dist/teste.js b/dist/teste.js index 90f9785..14a6a72 100644 --- a/dist/teste.js +++ b/dist/teste.js @@ -1,10 +1,9 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const logger_1 = require("./logger"); -const { error, info } = (0, logger_1.logger)({ +const l = (0, logger_1.logger)({ app: "teste", eProducao: true }); +const { error, info } = l({ inquilino: "conta_1", - app: "teste", - eProducao: true, usuario: "pedrinho", }); error("Deu Ruim"); diff --git a/dist/teste.js.map b/dist/teste.js.map index 49fb983..1b24700 100644 --- a/dist/teste.js.map +++ b/dist/teste.js.map @@ -1 +1 @@ -{"version":3,"file":"teste.js","sourceRoot":"","sources":["../src/teste.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAA,eAAM,EAAC;IAC7B,SAAS,EAAE,SAAS;IACpB,GAAG,EAAE,OAAO;IACZ,SAAS,EAAE,IAAI;IACf,OAAO,EAAE,UAAU;CACpB,CAAC,CAAA;AAEF,KAAK,CAAC,UAAU,CAAC,CAAA;AACjB,IAAI,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA"} \ No newline at end of file +{"version":3,"file":"teste.js","sourceRoot":"","sources":["../src/teste.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,MAAM,CAAC,GAAG,IAAA,eAAM,EAAC,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;AAEnD,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACxB,SAAS,EAAE,SAAS;IACpB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAA;AAEF,KAAK,CAAC,UAAU,CAAC,CAAA;AACjB,IAAI,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA"} \ No newline at end of file diff --git a/package.json b/package.json index 1b51b45..aceb1d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.76.0", + "version": "0.78.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index d5f48fa..17c9818 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -6,10 +6,8 @@ const LOKI_ENDPOINT = "/loki/api/v1/push" type tipoLevel = "info" | "warn" | "error" type tipoAmb = { - app: string inquilino: string usuario: string - eProducao: boolean } type tipoLog = { @@ -17,49 +15,51 @@ type tipoLog = { __filename?: string } -export const logger = ({ inquilino, app, eProducao, usuario }: tipoAmb) => { - const f = - (level: tipoLevel) => async (mensagem: string, op_tipoLog?: tipoLog) => { - let { __filename, detalhes } = op_tipoLog || {} +export const logger = + ({ app, eProducao }: { app: string; eProducao: boolean }) => + ({ inquilino, usuario }: tipoAmb) => { + const f = + (level: tipoLevel) => async (mensagem: string, op_tipoLog?: tipoLog) => { + let { __filename, detalhes } = op_tipoLog || {} - if (!eProducao) { - app = `DEV-${app}` - } + if (!eProducao) { + app = `DEV-${app}` + } - if (__filename && typeof process != "undefined" && process.cwd()) { - __filename = __filename.replace(process.cwd(), "") - } + if (__filename && typeof process != "undefined" && process.cwd()) { + __filename = __filename.replace(process.cwd(), "") + } - const timestamp = `${Date.now()}000000` + const timestamp = `${Date.now()}000000` - const mainLog = detalhes?.length - ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` - : mensagem + const mainLog = detalhes?.length + ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + : mensagem - const payload = { - stream: { app, inquilino, usuario, level }, - values: [ - [ - timestamp, - mainLog, // Linha de log direta + const payload = { + stream: { app, inquilino, usuario, level }, + values: [ + [ + timestamp, + mainLog, // Linha de log direta + ], ], - ], + } + + const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ streams: [payload] }), + }) + + if (!response.ok) { + throw new Error(`Erro ${response.status}: ${await response.text()}`) + } } - const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ streams: [payload] }), - }) - - if (!response.ok) { - throw new Error(`Erro ${response.status}: ${await response.text()}`) - } + return { + info: f("info"), + warn: f("warn"), + error: f("error"), } - - return { - info: f("info"), - warn: f("warn"), - error: f("error"), } -} diff --git a/src/teste.ts b/src/teste.ts index 2887ac0..3d62b99 100644 --- a/src/teste.ts +++ b/src/teste.ts @@ -1,9 +1,9 @@ import { logger } from "./logger" -const { error, info } = logger({ +const l = logger({ app: "teste", eProducao: true }) + +const { error, info } = l({ inquilino: "conta_1", - app: "teste", - eProducao: true, usuario: "pedrinho", }) From 36d3cc6aa491c619c8cdff3a1d55d51149930308 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Fri, 21 Feb 2025 17:58:21 -0300 Subject: [PATCH 45/76] . --- dist/logger.d.ts | 5 +++-- dist/logger.js | 9 ++++++++- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 15 ++++++++++++--- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index f6b7539..b2ecfde 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -1,15 +1,16 @@ -type tipoAmb = { +type tipoOpSessao = { inquilino: string; usuario: string; }; type tipoLog = { detalhes?: unknown[]; __filename?: string; + local?: string; }; export declare const logger: ({ app, eProducao }: { app: string; eProducao: boolean; -}) => ({ inquilino, usuario }: tipoAmb) => { +}) => ({ inquilino, usuario }: tipoOpSessao) => { info: (mensagem: string, op_tipoLog?: tipoLog) => Promise; warn: (mensagem: string, op_tipoLog?: tipoLog) => Promise; error: (mensagem: string, op_tipoLog?: tipoLog) => Promise; diff --git a/dist/logger.js b/dist/logger.js index 737c6ae..a02a837 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -5,17 +5,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); exports.logger = void 0; const cross_fetch_1 = __importDefault(require("cross-fetch")); +const variaveisComuns_1 = require("./variaveisComuns"); const LOKI_BASE_URL = "https://log.idz.one"; const LOKI_ENDPOINT = "/loki/api/v1/push"; const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => { const f = (level) => async (mensagem, op_tipoLog) => { - let { __filename, detalhes } = op_tipoLog || {}; + let { __filename, detalhes, local } = op_tipoLog || {}; if (!eProducao) { app = `DEV-${app}`; } if (__filename && typeof process != "undefined" && process.cwd()) { __filename = __filename.replace(process.cwd(), ""); } + if (local) { + detalhes = [`${(0, variaveisComuns_1.nomeVariavel)({ local })}="${local}"`]; + } + if (__filename) { + detalhes = [`${(0, variaveisComuns_1.nomeVariavel)({ __filename })}="${__filename}"`]; + } const timestamp = `${Date.now()}000000`; const mainLog = detalhes?.length ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` diff --git a/dist/logger.js.map b/dist/logger.js.map index d26ce2c..36dc69c 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AAEpC,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAclC,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAW,EAAE,EAAE;IAClC,MAAM,CAAC,GACL,CAAC,KAAgB,EAAE,EAAE,CAAC,KAAK,EAAE,QAAgB,EAAE,UAAoB,EAAE,EAAE;QACrE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;QAE/C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;QACpB,CAAC;QAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC;QAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;YAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACrE,CAAC,CAAC,QAAQ,CAAA;QAEZ,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YAC1C,MAAM,EAAE;gBACN;oBACE,SAAS;oBACT,OAAO,EAAE,sBAAsB;iBAChC;aACF;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;YACpE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC7C,CAAC,CAAA;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC,CAAA;IAEH,OAAO;QACL,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;KAClB,CAAA;AACH,CAAC,CAAA;AA/CU,QAAA,MAAM,UA+ChB"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAelC,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAgB,EAAE,EAAE;IACvC,MAAM,CAAC,GACL,CAAC,KAAgB,EAAE,EAAE,CAAC,KAAK,EAAE,QAAgB,EAAE,UAAoB,EAAE,EAAE;QACrE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;QAEtD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;QACpB,CAAC;QAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;QACtD,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;QAChE,CAAC;QAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;YAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACrE,CAAC,CAAC,QAAQ,CAAA;QAEZ,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YAC1C,MAAM,EAAE;gBACN;oBACE,SAAS;oBACT,OAAO,EAAE,sBAAsB;iBAChC;aACF;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;YACpE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC7C,CAAC,CAAA;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC,CAAA;IAEH,OAAO;QACL,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;KAClB,CAAA;AACH,CAAC,CAAA;AAtDU,QAAA,MAAM,UAsDhB"} \ No newline at end of file diff --git a/package.json b/package.json index aceb1d4..fd72c74 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.78.0", + "version": "0.79.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index 17c9818..4fb9d34 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -1,11 +1,12 @@ import crossFetch from "cross-fetch" +import { nomeVariavel } from "./variaveisComuns" const LOKI_BASE_URL = "https://log.idz.one" const LOKI_ENDPOINT = "/loki/api/v1/push" type tipoLevel = "info" | "warn" | "error" -type tipoAmb = { +type tipoOpSessao = { inquilino: string usuario: string } @@ -13,14 +14,15 @@ type tipoAmb = { type tipoLog = { detalhes?: unknown[] __filename?: string + local?: string } export const logger = ({ app, eProducao }: { app: string; eProducao: boolean }) => - ({ inquilino, usuario }: tipoAmb) => { + ({ inquilino, usuario }: tipoOpSessao) => { const f = (level: tipoLevel) => async (mensagem: string, op_tipoLog?: tipoLog) => { - let { __filename, detalhes } = op_tipoLog || {} + let { __filename, detalhes, local } = op_tipoLog || {} if (!eProducao) { app = `DEV-${app}` @@ -29,6 +31,13 @@ export const logger = if (__filename && typeof process != "undefined" && process.cwd()) { __filename = __filename.replace(process.cwd(), "") } + if (local) { + detalhes = [`${nomeVariavel({ local })}="${local}"`] + } + + if (__filename) { + detalhes = [`${nomeVariavel({ __filename })}="${__filename}"`] + } const timestamp = `${Date.now()}000000` From 79a83fe1586fdc7feafa3bac61d573072f2ab63f Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sat, 22 Feb 2025 10:38:12 -0300 Subject: [PATCH 46/76] melhorias em logger --- dist/logger.d.ts | 7 ++--- dist/logger.js | 73 ++++++++++++++++++++----------------------- dist/logger.js.map | 2 +- dist/teste.js | 6 ++-- dist/teste.js.map | 2 +- package.json | 2 +- src/logger.ts | 78 +++++++++++++++++++++------------------------- src/teste.ts | 6 ++-- 8 files changed, 79 insertions(+), 97 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index b2ecfde..15f4d06 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -1,3 +1,4 @@ +type tipoLevel = "info" | "warn" | "error"; type tipoOpSessao = { inquilino: string; usuario: string; @@ -10,9 +11,5 @@ type tipoLog = { export declare const logger: ({ app, eProducao }: { app: string; eProducao: boolean; -}) => ({ inquilino, usuario }: tipoOpSessao) => { - info: (mensagem: string, op_tipoLog?: tipoLog) => Promise; - warn: (mensagem: string, op_tipoLog?: tipoLog) => Promise; - error: (mensagem: string, op_tipoLog?: tipoLog) => Promise; -}; +}) => ({ inquilino, usuario }: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise; export {}; diff --git a/dist/logger.js b/dist/logger.js index a02a837..16cb32f 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -8,48 +8,41 @@ const cross_fetch_1 = __importDefault(require("cross-fetch")); const variaveisComuns_1 = require("./variaveisComuns"); const LOKI_BASE_URL = "https://log.idz.one"; const LOKI_ENDPOINT = "/loki/api/v1/push"; -const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => { - const f = (level) => async (mensagem, op_tipoLog) => { - let { __filename, detalhes, local } = op_tipoLog || {}; - if (!eProducao) { - app = `DEV-${app}`; - } - if (__filename && typeof process != "undefined" && process.cwd()) { - __filename = __filename.replace(process.cwd(), ""); - } - if (local) { - detalhes = [`${(0, variaveisComuns_1.nomeVariavel)({ local })}="${local}"`]; - } - if (__filename) { - detalhes = [`${(0, variaveisComuns_1.nomeVariavel)({ __filename })}="${__filename}"`]; - } - const timestamp = `${Date.now()}000000`; - const mainLog = detalhes?.length - ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` - : mensagem; - const payload = { - stream: { app, inquilino, usuario, level }, - values: [ - [ - timestamp, - mainLog, // Linha de log direta - ], +const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => async (level, mensagem, op_tipoLog) => { + let { __filename, detalhes, local } = op_tipoLog || {}; + if (!eProducao) { + app = `DEV-${app}`; + } + if (__filename && typeof process != "undefined" && process.cwd()) { + __filename = __filename.replace(process.cwd(), ""); + } + if (local) { + detalhes = [`${(0, variaveisComuns_1.nomeVariavel)({ local })}="${local}"`]; + } + if (__filename) { + detalhes = [`${(0, variaveisComuns_1.nomeVariavel)({ __filename })}="${__filename}"`]; + } + const timestamp = `${Date.now()}000000`; + const mainLog = detalhes?.length + ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + : mensagem; + const payload = { + stream: { app, inquilino, usuario, level }, + values: [ + [ + timestamp, + mainLog, // Linha de log direta ], - }; - const response = await (0, cross_fetch_1.default)(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ streams: [payload] }), - }); - if (!response.ok) { - throw new Error(`Erro ${response.status}: ${await response.text()}`); - } - }; - return { - info: f("info"), - warn: f("warn"), - error: f("error"), + ], }; + const response = await (0, cross_fetch_1.default)(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ streams: [payload] }), + }); + if (!response.ok) { + throw new Error(`Erro ${response.status}: ${await response.text()}`); + } }; exports.logger = logger; //# sourceMappingURL=logger.js.map \ No newline at end of file diff --git a/dist/logger.js.map b/dist/logger.js.map index 36dc69c..66d96fc 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAelC,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAgB,EAAE,EAAE;IACvC,MAAM,CAAC,GACL,CAAC,KAAgB,EAAE,EAAE,CAAC,KAAK,EAAE,QAAgB,EAAE,UAAoB,EAAE,EAAE;QACrE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;QAEtD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;QACpB,CAAC;QAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;QACtD,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;QAChE,CAAC;QAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;YAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACrE,CAAC,CAAC,QAAQ,CAAA;QAEZ,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YAC1C,MAAM,EAAE;gBACN;oBACE,SAAS;oBACT,OAAO,EAAE,sBAAsB;iBAChC;aACF;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;YACpE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC7C,CAAC,CAAA;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC,CAAA;IAEH,OAAO;QACL,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;KAClB,CAAA;AACH,CAAC,CAAA;AAtDU,QAAA,MAAM,UAsDhB"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAelC,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAgB,EAAE,EAAE,CACzC,KAAK,EAAE,KAAgB,EAAE,QAAgB,EAAE,UAAoB,EAAE,EAAE;IACjE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;IAEtD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;IACpB,CAAC;IAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;IACpD,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;IAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;QAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrE,CAAC,CAAC,QAAQ,CAAA;IAEZ,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;QAC1C,MAAM,EAAE;YACN;gBACE,SAAS;gBACT,OAAO,EAAE,sBAAsB;aAChC;SACF;KACF,CAAA;IAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;QACpE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;KAC7C,CAAC,CAAA;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IACtE,CAAC;AACH,CAAC,CAAA;AA9CU,QAAA,MAAM,UA8ChB"} \ No newline at end of file diff --git a/dist/teste.js b/dist/teste.js index 14a6a72..66c0930 100644 --- a/dist/teste.js +++ b/dist/teste.js @@ -2,10 +2,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); const logger_1 = require("./logger"); const l = (0, logger_1.logger)({ app: "teste", eProducao: true }); -const { error, info } = l({ +const lg = l({ inquilino: "conta_1", usuario: "pedrinho", }); -error("Deu Ruim"); -info("Deu Bom", { __filename }); +lg("error", "Deu Ruim"); +lg("info", "Deu Bom", { __filename }); //# sourceMappingURL=teste.js.map \ No newline at end of file diff --git a/dist/teste.js.map b/dist/teste.js.map index 1b24700..79e6290 100644 --- a/dist/teste.js.map +++ b/dist/teste.js.map @@ -1 +1 @@ -{"version":3,"file":"teste.js","sourceRoot":"","sources":["../src/teste.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,MAAM,CAAC,GAAG,IAAA,eAAM,EAAC,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;AAEnD,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACxB,SAAS,EAAE,SAAS;IACpB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAA;AAEF,KAAK,CAAC,UAAU,CAAC,CAAA;AACjB,IAAI,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA"} \ No newline at end of file +{"version":3,"file":"teste.js","sourceRoot":"","sources":["../src/teste.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,MAAM,CAAC,GAAG,IAAA,eAAM,EAAC,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;AAEnD,MAAM,EAAE,GAAG,CAAC,CAAC;IACX,SAAS,EAAE,SAAS;IACpB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAA;AAEF,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;AACvB,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA"} \ No newline at end of file diff --git a/package.json b/package.json index fd72c74..96b8a05 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.79.0", + "version": "0.80.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index 4fb9d34..53703b1 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -19,56 +19,48 @@ type tipoLog = { export const logger = ({ app, eProducao }: { app: string; eProducao: boolean }) => - ({ inquilino, usuario }: tipoOpSessao) => { - const f = - (level: tipoLevel) => async (mensagem: string, op_tipoLog?: tipoLog) => { - let { __filename, detalhes, local } = op_tipoLog || {} + ({ inquilino, usuario }: tipoOpSessao) => + async (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => { + let { __filename, detalhes, local } = op_tipoLog || {} - if (!eProducao) { - app = `DEV-${app}` - } + if (!eProducao) { + app = `DEV-${app}` + } - if (__filename && typeof process != "undefined" && process.cwd()) { - __filename = __filename.replace(process.cwd(), "") - } - if (local) { - detalhes = [`${nomeVariavel({ local })}="${local}"`] - } + if (__filename && typeof process != "undefined" && process.cwd()) { + __filename = __filename.replace(process.cwd(), "") + } + if (local) { + detalhes = [`${nomeVariavel({ local })}="${local}"`] + } - if (__filename) { - detalhes = [`${nomeVariavel({ __filename })}="${__filename}"`] - } + if (__filename) { + detalhes = [`${nomeVariavel({ __filename })}="${__filename}"`] + } - const timestamp = `${Date.now()}000000` + const timestamp = `${Date.now()}000000` - const mainLog = detalhes?.length - ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` - : mensagem + const mainLog = detalhes?.length + ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + : mensagem - const payload = { - stream: { app, inquilino, usuario, level }, - values: [ - [ - timestamp, - mainLog, // Linha de log direta - ], - ], - } + const payload = { + stream: { app, inquilino, usuario, level }, + values: [ + [ + timestamp, + mainLog, // Linha de log direta + ], + ], + } - const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ streams: [payload] }), - }) + const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ streams: [payload] }), + }) - if (!response.ok) { - throw new Error(`Erro ${response.status}: ${await response.text()}`) - } - } - - return { - info: f("info"), - warn: f("warn"), - error: f("error"), + if (!response.ok) { + throw new Error(`Erro ${response.status}: ${await response.text()}`) } } diff --git a/src/teste.ts b/src/teste.ts index 3d62b99..3be080e 100644 --- a/src/teste.ts +++ b/src/teste.ts @@ -2,10 +2,10 @@ import { logger } from "./logger" const l = logger({ app: "teste", eProducao: true }) -const { error, info } = l({ +const lg = l({ inquilino: "conta_1", usuario: "pedrinho", }) -error("Deu Ruim") -info("Deu Bom", { __filename }) +lg("error", "Deu Ruim") +lg("info", "Deu Bom", { __filename }) From e1d94a75bda091facce8542a40ba801ae09c0a73 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sat, 22 Feb 2025 14:04:59 -0300 Subject: [PATCH 47/76] build --- dist/logger.d.ts | 2 +- dist/logger.js | 8 +++++--- dist/logger.js.map | 2 +- dist/teste.js | 4 ++-- dist/teste.js.map | 2 +- package.json | 2 +- src/logger.ts | 17 ++++++++++++----- src/teste.ts | 6 ++++-- 8 files changed, 27 insertions(+), 16 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index 15f4d06..3aa0704 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -11,5 +11,5 @@ type tipoLog = { export declare const logger: ({ app, eProducao }: { app: string; eProducao: boolean; -}) => ({ inquilino, usuario }: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise; +}) => ({ inquilino, usuario }: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise<[objeto: object, erro?: string]>; export {}; diff --git a/dist/logger.js b/dist/logger.js index 16cb32f..cc42171 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -35,14 +35,16 @@ const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => async (level, ], ], }; + const objeto = { streams: [payload] }; const response = await (0, cross_fetch_1.default)(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { method: "POST", headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ streams: [payload] }), - }); + body: JSON.stringify(objeto), + }).catch((a) => a); if (!response.ok) { - throw new Error(`Erro ${response.status}: ${await response.text()}`); + return [objeto, `Erro ${response.status}: ${await response?.text?.()}`]; } + return [objeto]; }; exports.logger = logger; //# sourceMappingURL=logger.js.map \ No newline at end of file diff --git a/dist/logger.js.map b/dist/logger.js.map index 66d96fc..15ecedb 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAelC,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAgB,EAAE,EAAE,CACzC,KAAK,EAAE,KAAgB,EAAE,QAAgB,EAAE,UAAoB,EAAE,EAAE;IACjE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;IAEtD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;IACpB,CAAC;IAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;IACpD,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;IAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;QAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrE,CAAC,CAAC,QAAQ,CAAA;IAEZ,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;QAC1C,MAAM,EAAE;YACN;gBACE,SAAS;gBACT,OAAO,EAAE,sBAAsB;aAChC;SACF;KACF,CAAA;IAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;QACpE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;KAC7C,CAAC,CAAA;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IACtE,CAAC;AACH,CAAC,CAAA;AA9CU,QAAA,MAAM,UA8ChB"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAelC,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAgB,EAAE,EAAE,CACzC,KAAK,EACH,KAAgB,EAChB,QAAgB,EAChB,UAAoB,EACsB,EAAE;IAC5C,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;IAEtD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;IACpB,CAAC;IAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;IACpD,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;IAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;QAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrE,CAAC,CAAC,QAAQ,CAAA;IAEZ,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;QAC1C,MAAM,EAAE;YACN;gBACE,SAAS;gBACT,OAAO,EAAE,sBAAsB;aAChC;SACF;KACF,CAAA;IAED,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAA;IAErC,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;QACpE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;KAC7B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,EAAE,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IACzE,CAAC;IAED,OAAO,CAAC,MAAM,CAAC,CAAA;AACjB,CAAC,CAAA;AArDU,QAAA,MAAM,UAqDhB"} \ No newline at end of file diff --git a/dist/teste.js b/dist/teste.js index 66c0930..c8ae54c 100644 --- a/dist/teste.js +++ b/dist/teste.js @@ -6,6 +6,6 @@ const lg = l({ inquilino: "conta_1", usuario: "pedrinho", }); -lg("error", "Deu Ruim"); -lg("info", "Deu Bom", { __filename }); +lg("error", "Deu Ruim").then((a) => console.log(JSON.stringify(a))); +lg("info", "Deu Bom", { __filename }).then((a) => console.log(JSON.stringify(a))); //# sourceMappingURL=teste.js.map \ No newline at end of file diff --git a/dist/teste.js.map b/dist/teste.js.map index 79e6290..5f79640 100644 --- a/dist/teste.js.map +++ b/dist/teste.js.map @@ -1 +1 @@ -{"version":3,"file":"teste.js","sourceRoot":"","sources":["../src/teste.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,MAAM,CAAC,GAAG,IAAA,eAAM,EAAC,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;AAEnD,MAAM,EAAE,GAAG,CAAC,CAAC;IACX,SAAS,EAAE,SAAS;IACpB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAA;AAEF,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;AACvB,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA"} \ No newline at end of file +{"version":3,"file":"teste.js","sourceRoot":"","sources":["../src/teste.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,MAAM,CAAC,GAAG,IAAA,eAAM,EAAC,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;AAEnD,MAAM,EAAE,GAAG,CAAC,CAAC;IACX,SAAS,EAAE,SAAS;IACpB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAA;AAEF,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AACnE,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAC/B,CAAA"} \ No newline at end of file diff --git a/package.json b/package.json index 96b8a05..b7bb25f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.80.0", + "version": "0.82.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index 53703b1..a3b58e4 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -20,7 +20,11 @@ type tipoLog = { export const logger = ({ app, eProducao }: { app: string; eProducao: boolean }) => ({ inquilino, usuario }: tipoOpSessao) => - async (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => { + async ( + level: tipoLevel, + mensagem: string, + op_tipoLog?: tipoLog, + ): Promise<[objeto: object, erro?: string]> => { let { __filename, detalhes, local } = op_tipoLog || {} if (!eProducao) { @@ -54,13 +58,16 @@ export const logger = ], } + const objeto = { streams: [payload] } + const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { method: "POST", headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ streams: [payload] }), - }) - + body: JSON.stringify(objeto), + }).catch((a) => a) if (!response.ok) { - throw new Error(`Erro ${response.status}: ${await response.text()}`) + return [objeto, `Erro ${response.status}: ${await response?.text?.()}`] } + + return [objeto] } diff --git a/src/teste.ts b/src/teste.ts index 3be080e..fc1d4cc 100644 --- a/src/teste.ts +++ b/src/teste.ts @@ -7,5 +7,7 @@ const lg = l({ usuario: "pedrinho", }) -lg("error", "Deu Ruim") -lg("info", "Deu Bom", { __filename }) +lg("error", "Deu Ruim").then((a) => console.log(JSON.stringify(a))) +lg("info", "Deu Bom", { __filename }).then((a) => + console.log(JSON.stringify(a)), +) From 505f64f70bce28b4f52771c8ab4c0042d8377118 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sat, 22 Feb 2025 14:24:26 -0300 Subject: [PATCH 48/76] melhorias em log --- dist/logger.d.ts | 3 +++ dist/logger.js | 27 +++++++++++++++++---------- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 26 +++++++++++++++++--------- 5 files changed, 39 insertions(+), 21 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index 3aa0704..cb9dd10 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -1,3 +1,6 @@ +export declare const postLogger: ({ objeto, }: { + objeto: any; +}) => Promise<[objeto: any, erro?: string]>; type tipoLevel = "info" | "warn" | "error"; type tipoOpSessao = { inquilino: string; diff --git a/dist/logger.js b/dist/logger.js index cc42171..d73cd50 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -3,11 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.logger = void 0; +exports.logger = exports.postLogger = void 0; const cross_fetch_1 = __importDefault(require("cross-fetch")); const variaveisComuns_1 = require("./variaveisComuns"); const LOKI_BASE_URL = "https://log.idz.one"; const LOKI_ENDPOINT = "/loki/api/v1/push"; +const postLogger = async ({ objeto, }) => { + const response = await (0, cross_fetch_1.default)(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(objeto), + }).catch((a) => a); + if (!response.ok) { + return [objeto, `Erro ${response.status}: ${await response?.text?.()}`]; + } + else { + return [objeto]; + } +}; +exports.postLogger = postLogger; const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => async (level, mensagem, op_tipoLog) => { let { __filename, detalhes, local } = op_tipoLog || {}; if (!eProducao) { @@ -36,15 +50,8 @@ const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => async (level, ], }; const objeto = { streams: [payload] }; - const response = await (0, cross_fetch_1.default)(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify(objeto), - }).catch((a) => a); - if (!response.ok) { - return [objeto, `Erro ${response.status}: ${await response?.text?.()}`]; - } - return [objeto]; + const response = await (0, exports.postLogger)({ objeto }); + return response; }; exports.logger = logger; //# sourceMappingURL=logger.js.map \ No newline at end of file diff --git a/dist/logger.js.map b/dist/logger.js.map index 15ecedb..6aeb4e7 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAelC,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAgB,EAAE,EAAE,CACzC,KAAK,EACH,KAAgB,EAChB,QAAgB,EAChB,UAAoB,EACsB,EAAE;IAC5C,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;IAEtD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;IACpB,CAAC;IAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;IACpD,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;IAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;QAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrE,CAAC,CAAC,QAAQ,CAAA;IAEZ,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;QAC1C,MAAM,EAAE;YACN;gBACE,SAAS;gBACT,OAAO,EAAE,sBAAsB;aAChC;SACF;KACF,CAAA;IAED,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAA;IAErC,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;QACpE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;KAC7B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,EAAE,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IACzE,CAAC;IAED,OAAO,CAAC,MAAM,CAAC,CAAA;AACjB,CAAC,CAAA;AArDU,QAAA,MAAM,UAqDhB"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAElC,MAAM,UAAU,GAAG,KAAK,EAAE,EAC/B,MAAM,GACU,EAAyC,EAAE;IAC3D,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;QACpE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;KAC7B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,EAAE,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IACzE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,CAAA;IACjB,CAAC;AACH,CAAC,CAAA;AAbY,QAAA,UAAU,cAatB;AAeM,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAgB,EAAE,EAAE,CACzC,KAAK,EACH,KAAgB,EAChB,QAAgB,EAChB,UAAoB,EACsB,EAAE;IAC5C,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;IAEtD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;IACpB,CAAC;IAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;IACpD,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;IAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;QAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrE,CAAC,CAAC,QAAQ,CAAA;IAEZ,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;QAC1C,MAAM,EAAE;YACN;gBACE,SAAS;gBACT,OAAO,EAAE,sBAAsB;aAChC;SACF;KACF,CAAA;IAED,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAA;IAErC,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAE7C,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AA9CU,QAAA,MAAM,UA8ChB"} \ No newline at end of file diff --git a/package.json b/package.json index b7bb25f..6545413 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.82.0", + "version": "0.83.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index a3b58e4..5d6289f 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -4,6 +4,21 @@ import { nomeVariavel } from "./variaveisComuns" const LOKI_BASE_URL = "https://log.idz.one" const LOKI_ENDPOINT = "/loki/api/v1/push" +export const postLogger = async ({ + objeto, +}: { objeto: any }): Promise<[objeto: any, erro?: string]> => { + const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(objeto), + }).catch((a) => a) + if (!response.ok) { + return [objeto, `Erro ${response.status}: ${await response?.text?.()}`] + } else { + return [objeto] + } +} + type tipoLevel = "info" | "warn" | "error" type tipoOpSessao = { @@ -60,14 +75,7 @@ export const logger = const objeto = { streams: [payload] } - const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify(objeto), - }).catch((a) => a) - if (!response.ok) { - return [objeto, `Erro ${response.status}: ${await response?.text?.()}`] - } + const response = await postLogger({ objeto }) - return [objeto] + return response } From 6a0da630933ebc8dc5080f59d07dd1736ae0b333 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sat, 22 Feb 2025 17:46:02 -0300 Subject: [PATCH 49/76] . --- dist/logger.js | 3 ++- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 4 +++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dist/logger.js b/dist/logger.js index d73cd50..3297bd2 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -27,7 +27,8 @@ const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => async (level, if (!eProducao) { app = `DEV-${app}`; } - if (__filename && typeof process != "undefined" && process.cwd()) { + const isNode = typeof process !== "undefined" && process.versions?.node; + if (isNode && __filename) { __filename = __filename.replace(process.cwd(), ""); } if (local) { diff --git a/dist/logger.js.map b/dist/logger.js.map index 6aeb4e7..9ad76ff 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAElC,MAAM,UAAU,GAAG,KAAK,EAAE,EAC/B,MAAM,GACU,EAAyC,EAAE;IAC3D,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;QACpE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;KAC7B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,EAAE,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IACzE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,CAAA;IACjB,CAAC;AACH,CAAC,CAAA;AAbY,QAAA,UAAU,cAatB;AAeM,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAgB,EAAE,EAAE,CACzC,KAAK,EACH,KAAgB,EAChB,QAAgB,EAChB,UAAoB,EACsB,EAAE;IAC5C,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;IAEtD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;IACpB,CAAC;IAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;IACpD,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;IAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;QAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrE,CAAC,CAAC,QAAQ,CAAA;IAEZ,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;QAC1C,MAAM,EAAE;YACN;gBACE,SAAS;gBACT,OAAO,EAAE,sBAAsB;aAChC;SACF;KACF,CAAA;IAED,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAA;IAErC,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAE7C,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AA9CU,QAAA,MAAM,UA8ChB"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAElC,MAAM,UAAU,GAAG,KAAK,EAAE,EAC/B,MAAM,GACU,EAAyC,EAAE;IAC3D,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;QACpE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;KAC7B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,EAAE,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IACzE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,CAAA;IACjB,CAAC;AACH,CAAC,CAAA;AAbY,QAAA,UAAU,cAatB;AAeM,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAgB,EAAE,EAAE,CACzC,KAAK,EACH,KAAgB,EAChB,QAAgB,EAChB,UAAoB,EACsB,EAAE;IAC5C,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;IAEtD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;IACpB,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAA;IAEvE,IAAI,MAAM,IAAI,UAAU,EAAE,CAAC;QACzB,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;IACpD,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;IAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;QAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrE,CAAC,CAAC,QAAQ,CAAA;IAEZ,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;QAC1C,MAAM,EAAE;YACN;gBACE,SAAS;gBACT,OAAO,EAAE,sBAAsB;aAChC;SACF;KACF,CAAA;IAED,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAA;IAErC,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAE7C,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAhDU,QAAA,MAAM,UAgDhB"} \ No newline at end of file diff --git a/package.json b/package.json index 6545413..1445849 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.83.0", + "version": "0.85.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index 5d6289f..149482e 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -46,7 +46,9 @@ export const logger = app = `DEV-${app}` } - if (__filename && typeof process != "undefined" && process.cwd()) { + const isNode = typeof process !== "undefined" && process.versions?.node + + if (isNode && __filename) { __filename = __filename.replace(process.cwd(), "") } if (local) { From 0908fe53f344eeb0b54495e53b4b2794b0abb2c1 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sat, 22 Feb 2025 18:08:04 -0300 Subject: [PATCH 50/76] . --- dist/logger.js | 17 ++++++++++++++--- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 18 +++++++++++++++--- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dist/logger.js b/dist/logger.js index 3297bd2..8be3814 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -27,9 +27,20 @@ const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => async (level, if (!eProducao) { app = `DEV-${app}`; } - const isNode = typeof process !== "undefined" && process.versions?.node; - if (isNode && __filename) { - __filename = __filename.replace(process.cwd(), ""); + const isNode = typeof process !== "undefined" && + process.versions?.node && + process.versions.node !== ""; + try { + if (isNode && typeof __filename !== "undefined") { + // Modifica apenas se estiver em Node.js e as variáveis existirem + __filename = __filename.replace(process.cwd(), ""); + } + } + catch (error) { + // Ignora erros de variáveis não definidas no navegador + if (!(error instanceof ReferenceError)) { + throw error; + } } if (local) { detalhes = [`${(0, variaveisComuns_1.nomeVariavel)({ local })}="${local}"`]; diff --git a/dist/logger.js.map b/dist/logger.js.map index 9ad76ff..eaaa2e9 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAElC,MAAM,UAAU,GAAG,KAAK,EAAE,EAC/B,MAAM,GACU,EAAyC,EAAE;IAC3D,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;QACpE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;KAC7B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,EAAE,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IACzE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,CAAA;IACjB,CAAC;AACH,CAAC,CAAA;AAbY,QAAA,UAAU,cAatB;AAeM,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAgB,EAAE,EAAE,CACzC,KAAK,EACH,KAAgB,EAChB,QAAgB,EAChB,UAAoB,EACsB,EAAE;IAC5C,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;IAEtD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;IACpB,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAA;IAEvE,IAAI,MAAM,IAAI,UAAU,EAAE,CAAC;QACzB,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;IACpD,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;IAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;QAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrE,CAAC,CAAC,QAAQ,CAAA;IAEZ,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;QAC1C,MAAM,EAAE;YACN;gBACE,SAAS;gBACT,OAAO,EAAE,sBAAsB;aAChC;SACF;KACF,CAAA;IAED,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAA;IAErC,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAE7C,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAhDU,QAAA,MAAM,UAgDhB"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 1445849..44ed705 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.85.0", + "version": "0.86.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index 149482e..aad6052 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -46,11 +46,23 @@ export const logger = app = `DEV-${app}` } - const isNode = typeof process !== "undefined" && process.versions?.node + const isNode = + typeof process !== "undefined" && + process.versions?.node && + process.versions.node !== "" - if (isNode && __filename) { - __filename = __filename.replace(process.cwd(), "") + try { + if (isNode && typeof __filename !== "undefined") { + // Modifica apenas se estiver em Node.js e as variáveis existirem + __filename = __filename.replace(process.cwd(), "") + } + } catch (error) { + // Ignora erros de variáveis não definidas no navegador + if (!(error instanceof ReferenceError)) { + throw error + } } + if (local) { detalhes = [`${nomeVariavel({ local })}="${local}"`] } From e2bb1b7ca2d869b0bf8dc27b56dea56471f626d7 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sat, 22 Feb 2025 18:13:52 -0300 Subject: [PATCH 51/76] . --- dist/logger.js | 15 +++++++++++---- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 17 ++++++++++++----- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dist/logger.js b/dist/logger.js index 8be3814..bce93da 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -27,11 +27,18 @@ const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => async (level, if (!eProducao) { app = `DEV-${app}`; } - const isNode = typeof process !== "undefined" && - process.versions?.node && - process.versions.node !== ""; + const isNode = () => { + try { + return (typeof process !== "undefined" && + process.versions?.node && + !process.versions.electron); + } + catch { + return false; + } + }; try { - if (isNode && typeof __filename !== "undefined") { + if (isNode() && typeof __filename !== "undefined") { // Modifica apenas se estiver em Node.js e as variáveis existirem __filename = __filename.replace(process.cwd(), ""); } diff --git a/dist/logger.js.map b/dist/logger.js.map index eaaa2e9..12bcdd9 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 44ed705..d0a0fd9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.86.0", + "version": "0.87.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index aad6052..c1eb489 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -46,13 +46,20 @@ export const logger = app = `DEV-${app}` } - const isNode = - typeof process !== "undefined" && - process.versions?.node && - process.versions.node !== "" + const isNode = () => { + try { + return ( + typeof process !== "undefined" && + process.versions?.node && + !process.versions.electron + ) + } catch { + return false + } + } try { - if (isNode && typeof __filename !== "undefined") { + if (isNode() && typeof __filename !== "undefined") { // Modifica apenas se estiver em Node.js e as variáveis existirem __filename = __filename.replace(process.cwd(), "") } From d412131b3a5240ee71fc9fbff55f7f4e343cee9a Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sat, 22 Feb 2025 18:23:50 -0300 Subject: [PATCH 52/76] . --- dist/logger.d.ts | 2 ++ dist/logger.js | 31 +++++++++---------------------- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 31 +++++++++---------------------- 5 files changed, 22 insertions(+), 46 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index cb9dd10..34939c0 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -1,6 +1,8 @@ export declare const postLogger: ({ objeto, }: { objeto: any; }) => Promise<[objeto: any, erro?: string]>; +/** define a localização da pasta do projeto */ +export declare const defineCwd: (novoCwd: string) => void; type tipoLevel = "info" | "warn" | "error"; type tipoOpSessao = { inquilino: string; diff --git a/dist/logger.js b/dist/logger.js index bce93da..75fe8d8 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.logger = exports.postLogger = void 0; +exports.logger = exports.defineCwd = exports.postLogger = void 0; const cross_fetch_1 = __importDefault(require("cross-fetch")); const variaveisComuns_1 = require("./variaveisComuns"); const LOKI_BASE_URL = "https://log.idz.one"; @@ -22,32 +22,19 @@ const postLogger = async ({ objeto, }) => { } }; exports.postLogger = postLogger; +let cwd = ""; +/** define a localização da pasta do projeto */ +const defineCwd = (novoCwd) => { + cwd = novoCwd; +}; +exports.defineCwd = defineCwd; const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => async (level, mensagem, op_tipoLog) => { let { __filename, detalhes, local } = op_tipoLog || {}; if (!eProducao) { app = `DEV-${app}`; } - const isNode = () => { - try { - return (typeof process !== "undefined" && - process.versions?.node && - !process.versions.electron); - } - catch { - return false; - } - }; - try { - if (isNode() && typeof __filename !== "undefined") { - // Modifica apenas se estiver em Node.js e as variáveis existirem - __filename = __filename.replace(process.cwd(), ""); - } - } - catch (error) { - // Ignora erros de variáveis não definidas no navegador - if (!(error instanceof ReferenceError)) { - throw error; - } + if (cwd && __filename) { + __filename = __filename.replace(cwd, ""); } if (local) { detalhes = [`${(0, variaveisComuns_1.nomeVariavel)({ local })}="${local}"`]; diff --git a/dist/logger.js.map b/dist/logger.js.map index 12bcdd9..b85c8a2 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index d0a0fd9..f825072 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.87.0", + "version": "0.88.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index c1eb489..2bf9803 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -19,6 +19,13 @@ export const postLogger = async ({ } } +let cwd = "" + +/** define a localização da pasta do projeto */ +export const defineCwd = (novoCwd: string) => { + cwd = novoCwd +} + type tipoLevel = "info" | "warn" | "error" type tipoOpSessao = { @@ -46,28 +53,8 @@ export const logger = app = `DEV-${app}` } - const isNode = () => { - try { - return ( - typeof process !== "undefined" && - process.versions?.node && - !process.versions.electron - ) - } catch { - return false - } - } - - try { - if (isNode() && typeof __filename !== "undefined") { - // Modifica apenas se estiver em Node.js e as variáveis existirem - __filename = __filename.replace(process.cwd(), "") - } - } catch (error) { - // Ignora erros de variáveis não definidas no navegador - if (!(error instanceof ReferenceError)) { - throw error - } + if (cwd && __filename) { + __filename = __filename.replace(cwd, "") } if (local) { From 25273beaed2c588cc5af49235db747244ccd7d87 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sun, 23 Feb 2025 08:23:59 -0300 Subject: [PATCH 53/76] . --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f825072..b21c557 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.88.0", + "version": "0.89.0", "description": "", "main": "dist/index.js", "scripts": { From d1a7a364bdd8c63b7bd4c78688b6060af7b8b89f Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 24 Feb 2025 10:24:54 -0300 Subject: [PATCH 54/76] . --- src/logger.ts | 73 +++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/src/logger.ts b/src/logger.ts index 2bf9803..01d7672 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -40,50 +40,49 @@ type tipoLog = { } export const logger = - ({ app, eProducao }: { app: string; eProducao: boolean }) => - ({ inquilino, usuario }: tipoOpSessao) => - async ( - level: tipoLevel, - mensagem: string, - op_tipoLog?: tipoLog, - ): Promise<[objeto: object, erro?: string]> => { - let { __filename, detalhes, local } = op_tipoLog || {} + ({ app: app_e, eProducao }: { app: string; eProducao: boolean }) => + ({ inquilino, usuario }: tipoOpSessao) => + async ( + level: tipoLevel, + mensagem: string, + op_tipoLog?: tipoLog, + ): Promise<[objeto: object, erro?: string]> => { + let { __filename, detalhes, local } = op_tipoLog || {} - if (!eProducao) { - app = `DEV-${app}` - } + const app = `${eProducao ? '' : 'DEV-'}${app_e}` - if (cwd && __filename) { - __filename = __filename.replace(cwd, "") - } - if (local) { - detalhes = [`${nomeVariavel({ local })}="${local}"`] - } + if (cwd && __filename) { + __filename = __filename.replace(cwd, "") + } - if (__filename) { - detalhes = [`${nomeVariavel({ __filename })}="${__filename}"`] - } + if (local) { + detalhes = [`${nomeVariavel({ local })}="${local}"`] + } - const timestamp = `${Date.now()}000000` + if (__filename) { + detalhes = [`${nomeVariavel({ __filename })}="${__filename}"`] + } - const mainLog = detalhes?.length - ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` - : mensagem + const timestamp = `${Date.now()}000000` - const payload = { - stream: { app, inquilino, usuario, level }, - values: [ - [ - timestamp, - mainLog, // Linha de log direta - ], - ], - } + const mainLog = detalhes?.length + ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + : mensagem - const objeto = { streams: [payload] } + const payload = { + stream: { app, inquilino, usuario, level }, + values: [ + [ + timestamp, + mainLog, // Linha de log direta + ], + ], + } - const response = await postLogger({ objeto }) + const objeto = { streams: [payload] } - return response - } + const response = await postLogger({ objeto }) + + return response + } From 67f215ef82ccbe7225695b8f05f45947cc6f3594 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 24 Feb 2025 14:57:24 -0300 Subject: [PATCH 55/76] melhorias de log --- dist/logger.d.ts | 2 +- dist/logger.js | 6 ++-- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 69 +++++++++++++++++++++++----------------------- 5 files changed, 39 insertions(+), 42 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index 34939c0..f7fb927 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -13,7 +13,7 @@ type tipoLog = { __filename?: string; local?: string; }; -export declare const logger: ({ app, eProducao }: { +export declare const logger: ({ app: app_e, eProducao }: { app: string; eProducao: boolean; }) => ({ inquilino, usuario }: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise<[objeto: object, erro?: string]>; diff --git a/dist/logger.js b/dist/logger.js index 75fe8d8..4afe9a7 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -28,11 +28,9 @@ const defineCwd = (novoCwd) => { cwd = novoCwd; }; exports.defineCwd = defineCwd; -const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => async (level, mensagem, op_tipoLog) => { +const logger = ({ app: app_e, eProducao }) => ({ inquilino, usuario }) => async (level, mensagem, op_tipoLog) => { let { __filename, detalhes, local } = op_tipoLog || {}; - if (!eProducao) { - app = `DEV-${app}`; - } + const app = `${eProducao ? "" : "DEV-"}${app_e}`; if (cwd && __filename) { __filename = __filename.replace(cwd, ""); } diff --git a/dist/logger.js.map b/dist/logger.js.map index b85c8a2..bca7aa9 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index b21c557..f7e4aae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.89.0", + "version": "0.90.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index 01d7672..302e2f3 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -41,48 +41,47 @@ type tipoLog = { export const logger = ({ app: app_e, eProducao }: { app: string; eProducao: boolean }) => - ({ inquilino, usuario }: tipoOpSessao) => - async ( - level: tipoLevel, - mensagem: string, - op_tipoLog?: tipoLog, - ): Promise<[objeto: object, erro?: string]> => { - let { __filename, detalhes, local } = op_tipoLog || {} + ({ inquilino, usuario }: tipoOpSessao) => + async ( + level: tipoLevel, + mensagem: string, + op_tipoLog?: tipoLog, + ): Promise<[objeto: object, erro?: string]> => { + let { __filename, detalhes, local } = op_tipoLog || {} - const app = `${eProducao ? '' : 'DEV-'}${app_e}` + const app = `${eProducao ? "" : "DEV-"}${app_e}` + if (cwd && __filename) { + __filename = __filename.replace(cwd, "") + } - if (cwd && __filename) { - __filename = __filename.replace(cwd, "") - } + if (local) { + detalhes = [`${nomeVariavel({ local })}="${local}"`] + } - if (local) { - detalhes = [`${nomeVariavel({ local })}="${local}"`] - } + if (__filename) { + detalhes = [`${nomeVariavel({ __filename })}="${__filename}"`] + } - if (__filename) { - detalhes = [`${nomeVariavel({ __filename })}="${__filename}"`] - } + const timestamp = `${Date.now()}000000` - const timestamp = `${Date.now()}000000` + const mainLog = detalhes?.length + ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + : mensagem - const mainLog = detalhes?.length - ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` - : mensagem + const payload = { + stream: { app, inquilino, usuario, level }, + values: [ + [ + timestamp, + mainLog, // Linha de log direta + ], + ], + } - const payload = { - stream: { app, inquilino, usuario, level }, - values: [ - [ - timestamp, - mainLog, // Linha de log direta - ], - ], - } + const objeto = { streams: [payload] } - const objeto = { streams: [payload] } + const response = await postLogger({ objeto }) - const response = await postLogger({ objeto }) - - return response - } + return response + } From 38849c8a1d6d7cdc9561a261025f15903fb6758a Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Tue, 25 Feb 2025 13:44:08 -0300 Subject: [PATCH 56/76] melhorias --- dist/logger.d.ts | 3 +++ dist/logger.js | 4 ++-- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 5 +++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index f7fb927..d775b95 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -12,6 +12,9 @@ type tipoLog = { detalhes?: unknown[]; __filename?: string; local?: string; + parametros?: { + [k: string]: string; + }; }; export declare const logger: ({ app: app_e, eProducao }: { app: string; diff --git a/dist/logger.js b/dist/logger.js index 4afe9a7..4915c59 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -29,7 +29,7 @@ const defineCwd = (novoCwd) => { }; exports.defineCwd = defineCwd; const logger = ({ app: app_e, eProducao }) => ({ inquilino, usuario }) => async (level, mensagem, op_tipoLog) => { - let { __filename, detalhes, local } = op_tipoLog || {}; + let { __filename, detalhes, local, parametros } = op_tipoLog || {}; const app = `${eProducao ? "" : "DEV-"}${app_e}`; if (cwd && __filename) { __filename = __filename.replace(cwd, ""); @@ -45,7 +45,7 @@ const logger = ({ app: app_e, eProducao }) => ({ inquilino, usuario }) => async ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` : mensagem; const payload = { - stream: { app, inquilino, usuario, level }, + stream: { app, inquilino, usuario, level, ...(parametros || {}) }, values: [ [ timestamp, diff --git a/dist/logger.js.map b/dist/logger.js.map index bca7aa9..b29c4d4 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index f7e4aae..1318205 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.90.0", + "version": "0.91.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index 302e2f3..bac76ec 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -37,6 +37,7 @@ type tipoLog = { detalhes?: unknown[] __filename?: string local?: string + parametros?: { [k: string]: string } } export const logger = @@ -47,7 +48,7 @@ export const logger = mensagem: string, op_tipoLog?: tipoLog, ): Promise<[objeto: object, erro?: string]> => { - let { __filename, detalhes, local } = op_tipoLog || {} + let { __filename, detalhes, local, parametros } = op_tipoLog || {} const app = `${eProducao ? "" : "DEV-"}${app_e}` @@ -70,7 +71,7 @@ export const logger = : mensagem const payload = { - stream: { app, inquilino, usuario, level }, + stream: { app, inquilino, usuario, level, ...(parametros || {}) }, values: [ [ timestamp, From 257ac91394546d38810d5dcf29dcbdf65c23c0cc Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Tue, 25 Feb 2025 14:05:01 -0300 Subject: [PATCH 57/76] parametros --- dist/logger.d.ts | 10 ++++++++-- dist/logger.js | 14 +++++++++++--- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 30 ++++++++++++++++++++++++++---- 5 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index d775b95..ebb5a37 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -7,6 +7,9 @@ type tipoLevel = "info" | "warn" | "error"; type tipoOpSessao = { inquilino: string; usuario: string; + parametros?: { + [k: string]: string; + }; }; type tipoLog = { detalhes?: unknown[]; @@ -16,8 +19,11 @@ type tipoLog = { [k: string]: string; }; }; -export declare const logger: ({ app: app_e, eProducao }: { +export declare const logger: ({ app: app_e, eProducao, parametros: parametrosAmbiente, }: { app: string; eProducao: boolean; -}) => ({ inquilino, usuario }: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise<[objeto: object, erro?: string]>; + parametros?: { + [k: string]: string; + }; +}) => ({ inquilino, usuario, parametros: parametrosSessao }: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise<[objeto: object, erro?: string]>; export {}; diff --git a/dist/logger.js b/dist/logger.js index 4915c59..2bad1ed 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -28,8 +28,8 @@ const defineCwd = (novoCwd) => { cwd = novoCwd; }; exports.defineCwd = defineCwd; -const logger = ({ app: app_e, eProducao }) => ({ inquilino, usuario }) => async (level, mensagem, op_tipoLog) => { - let { __filename, detalhes, local, parametros } = op_tipoLog || {}; +const logger = ({ app: app_e, eProducao, parametros: parametrosAmbiente, }) => ({ inquilino, usuario, parametros: parametrosSessao }) => async (level, mensagem, op_tipoLog) => { + let { __filename, detalhes, local, parametros: parametrosLog, } = op_tipoLog || {}; const app = `${eProducao ? "" : "DEV-"}${app_e}`; if (cwd && __filename) { __filename = __filename.replace(cwd, ""); @@ -45,7 +45,15 @@ const logger = ({ app: app_e, eProducao }) => ({ inquilino, usuario }) => async ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` : mensagem; const payload = { - stream: { app, inquilino, usuario, level, ...(parametros || {}) }, + stream: { + app, + inquilino, + usuario, + level, + ...(parametrosAmbiente || {}), + ...(parametrosSessao || {}), + ...(parametrosLog || {}), + }, values: [ [ timestamp, diff --git a/dist/logger.js.map b/dist/logger.js.map index b29c4d4..ce50256 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 1318205..f59f7c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.91.0", + "version": "0.92.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index bac76ec..31e4850 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -31,6 +31,7 @@ type tipoLevel = "info" | "warn" | "error" type tipoOpSessao = { inquilino: string usuario: string + parametros?: { [k: string]: string } } type tipoLog = { @@ -41,14 +42,27 @@ type tipoLog = { } export const logger = - ({ app: app_e, eProducao }: { app: string; eProducao: boolean }) => - ({ inquilino, usuario }: tipoOpSessao) => + ({ + app: app_e, + eProducao, + parametros: parametrosAmbiente, + }: { + app: string + eProducao: boolean + parametros?: { [k: string]: string } + }) => + ({ inquilino, usuario, parametros: parametrosSessao }: tipoOpSessao) => async ( level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog, ): Promise<[objeto: object, erro?: string]> => { - let { __filename, detalhes, local, parametros } = op_tipoLog || {} + let { + __filename, + detalhes, + local, + parametros: parametrosLog, + } = op_tipoLog || {} const app = `${eProducao ? "" : "DEV-"}${app_e}` @@ -71,7 +85,15 @@ export const logger = : mensagem const payload = { - stream: { app, inquilino, usuario, level, ...(parametros || {}) }, + stream: { + app, + inquilino, + usuario, + level, + ...(parametrosAmbiente || {}), + ...(parametrosSessao || {}), + ...(parametrosLog || {}), + }, values: [ [ timestamp, From 1350348900bece75a07fcb16f1cca9f7f07cac2d Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Wed, 26 Feb 2025 14:06:55 -0300 Subject: [PATCH 58/76] build --- .npmrc | 1 + package.json | 2 +- pnpm-lock.yaml | 16 ++++++++-------- 3 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..6c59086 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +enable-pre-post-scripts=true diff --git a/package.json b/package.json index f59f7c5..abfb152 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.92.0", + "version": "0.93.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 677017c..1c07024 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,10 +20,10 @@ importers: version: 1.9.4 '@types/node': specifier: ^20.16.10 - version: 20.16.10 + version: 20.17.19 typescript: specifier: ^5.7.2 - version: 5.7.2 + version: 5.7.3 packages: @@ -80,8 +80,8 @@ packages: cpu: [x64] os: [win32] - '@types/node@20.16.10': - resolution: {integrity: sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==} + '@types/node@20.17.19': + resolution: {integrity: sha512-LEwC7o1ifqg/6r2gn9Dns0f1rhK+fPFDoMiceTJ6kWmVk6bgXBI/9IOWfVan4WiAavK9pIVWdX0/e3J+eEUh5A==} cross-fetch@4.1.0: resolution: {integrity: sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw==} @@ -98,8 +98,8 @@ packages: tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} - typescript@5.7.2: - resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==} + typescript@5.7.3: + resolution: {integrity: sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==} engines: {node: '>=14.17'} hasBin: true @@ -152,7 +152,7 @@ snapshots: '@biomejs/cli-win32-x64@1.9.4': optional: true - '@types/node@20.16.10': + '@types/node@20.17.19': dependencies: undici-types: 6.19.8 @@ -168,7 +168,7 @@ snapshots: tr46@0.0.3: {} - typescript@5.7.2: {} + typescript@5.7.3: {} undici-types@6.19.8: {} From 25b760a2ff5121519ef5f27adb25bb8ee5be3c2b Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Thu, 27 Feb 2025 11:32:44 -0300 Subject: [PATCH 59/76] adicionado tipagem loki --- dist/logger.d.ts | 14 +++++++++++--- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 18 ++++++++++++++---- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index ebb5a37..542452f 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -1,6 +1,14 @@ +export type tipoLokiObjeto = { + streams: { + stream: { + [k: string]: string; + }; + values: [string, string][]; + }[]; +}; export declare const postLogger: ({ objeto, }: { - objeto: any; -}) => Promise<[objeto: any, erro?: string]>; + objeto: tipoLokiObjeto; +}) => Promise<[objeto: tipoLokiObjeto, erro?: string]>; /** define a localização da pasta do projeto */ export declare const defineCwd: (novoCwd: string) => void; type tipoLevel = "info" | "warn" | "error"; @@ -25,5 +33,5 @@ export declare const logger: ({ app: app_e, eProducao, parametros: parametrosAmb parametros?: { [k: string]: string; }; -}) => ({ inquilino, usuario, parametros: parametrosSessao }: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise<[objeto: object, erro?: string]>; +}) => ({ inquilino, usuario, parametros: parametrosSessao }: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise<[objeto: tipoLokiObjeto, erro?: string]>; export {}; diff --git a/dist/logger.js.map b/dist/logger.js.map index ce50256..265e54e 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAUlC,MAAM,UAAU,GAAG,KAAK,EAAE,EAC/B,MAAM,GACqB,EAE3B,EAAE;IACF,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;QACpE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;KAC7B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,EAAE,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IACzE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,CAAA;IACjB,CAAC;AACH,CAAC,CAAA;AAfY,QAAA,UAAU,cAetB;AAED,IAAI,GAAG,GAAG,EAAE,CAAA;AAEZ,+CAA+C;AACxC,MAAM,SAAS,GAAG,CAAC,OAAe,EAAE,EAAE;IAC3C,GAAG,GAAG,OAAO,CAAA;AACf,CAAC,CAAA;AAFY,QAAA,SAAS,aAErB;AAiBM,MAAM,MAAM,GACjB,CAAC,EACC,GAAG,EAAE,KAAK,EACV,SAAS,EACT,UAAU,EAAE,kBAAkB,GAK/B,EAAE,EAAE,CACL,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAgB,EAAE,EAAE,CACvE,KAAK,EACH,KAAgB,EAChB,QAAgB,EAChB,UAAoB,EAC8B,EAAE;IACpD,IAAI,EACF,UAAU,EACV,QAAQ,EACR,KAAK,EACL,UAAU,EAAE,aAAa,GAC1B,GAAG,UAAU,IAAI,EAAE,CAAA;IAEpB,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,KAAK,EAAE,CAAA;IAEhD,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;QACtB,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;IAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;QAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrE,CAAC,CAAC,QAAQ,CAAA;IAEZ,MAAM,OAAO,GAAsC;QACjD,MAAM,EAAE;YACN,GAAG;YACH,SAAS;YACT,OAAO;YACP,KAAK;YACL,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC;YAC7B,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;YAC3B,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;SACzB;QACD,MAAM,EAAE;YACN;gBACE,SAAS;gBACT,OAAO,EAAE,sBAAsB;aAChC;SACF;KACF,CAAA;IAED,MAAM,MAAM,GAAmB,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAA;IAErD,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAE7C,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAlEU,QAAA,MAAM,UAkEhB"} \ No newline at end of file diff --git a/package.json b/package.json index abfb152..d6bb6ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.93.0", + "version": "0.94.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index 31e4850..8713fcf 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -3,10 +3,20 @@ import { nomeVariavel } from "./variaveisComuns" const LOKI_BASE_URL = "https://log.idz.one" const LOKI_ENDPOINT = "/loki/api/v1/push" +export type tipoLokiObjeto = { + streams: { + stream: { + [k: string]: string + } + values: [string, string][] + }[] +} export const postLogger = async ({ objeto, -}: { objeto: any }): Promise<[objeto: any, erro?: string]> => { +}: { objeto: tipoLokiObjeto }): Promise< + [objeto: tipoLokiObjeto, erro?: string] +> => { const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { method: "POST", headers: { "Content-Type": "application/json" }, @@ -56,7 +66,7 @@ export const logger = level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog, - ): Promise<[objeto: object, erro?: string]> => { + ): Promise<[objeto: tipoLokiObjeto, erro?: string]> => { let { __filename, detalhes, @@ -84,7 +94,7 @@ export const logger = ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` : mensagem - const payload = { + const payload: tipoLokiObjeto["streams"][number] = { stream: { app, inquilino, @@ -102,7 +112,7 @@ export const logger = ], } - const objeto = { streams: [payload] } + const objeto: tipoLokiObjeto = { streams: [payload] } const response = await postLogger({ objeto }) From 1ac82cb863096e7e7ceaaaedb4f35d11d2a3f13a Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Thu, 27 Feb 2025 15:39:52 -0300 Subject: [PATCH 60/76] melhoria de tipagem --- dist/logger.d.ts | 5 +++-- dist/logger.js | 2 +- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 34 ++++++++++++++++++---------------- 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index 542452f..a087f56 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -27,11 +27,12 @@ type tipoLog = { [k: string]: string; }; }; -export declare const logger: ({ app: app_e, eProducao, parametros: parametrosAmbiente, }: { +type tipoLogger = (amb: { app: string; eProducao: boolean; parametros?: { [k: string]: string; }; -}) => ({ inquilino, usuario, parametros: parametrosSessao }: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise<[objeto: tipoLokiObjeto, erro?: string]>; +}) => (sess: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise<[objeto: tipoLokiObjeto, erro?: string]>; +export declare const logger: tipoLogger; export {}; diff --git a/dist/logger.js b/dist/logger.js index 2bad1ed..2027c3d 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -28,7 +28,7 @@ const defineCwd = (novoCwd) => { cwd = novoCwd; }; exports.defineCwd = defineCwd; -const logger = ({ app: app_e, eProducao, parametros: parametrosAmbiente, }) => ({ inquilino, usuario, parametros: parametrosSessao }) => async (level, mensagem, op_tipoLog) => { +const logger = ({ app: app_e, eProducao, parametros: parametrosAmbiente }) => ({ inquilino, usuario, parametros: parametrosSessao }) => async (level, mensagem, op_tipoLog) => { let { __filename, detalhes, local, parametros: parametrosLog, } = op_tipoLog || {}; const app = `${eProducao ? "" : "DEV-"}${app_e}`; if (cwd && __filename) { diff --git a/dist/logger.js.map b/dist/logger.js.map index 265e54e..58cef3d 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index d6bb6ed..f3e0d8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.94.0", + "version": "0.97.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index 8713fcf..c4acda6 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -51,22 +51,24 @@ type tipoLog = { parametros?: { [k: string]: string } } -export const logger = - ({ - app: app_e, - eProducao, - parametros: parametrosAmbiente, - }: { - app: string - eProducao: boolean - parametros?: { [k: string]: string } - }) => - ({ inquilino, usuario, parametros: parametrosSessao }: tipoOpSessao) => - async ( - level: tipoLevel, - mensagem: string, - op_tipoLog?: tipoLog, - ): Promise<[objeto: tipoLokiObjeto, erro?: string]> => { +type tipoLogger = (amb: { + app: string + eProducao: boolean + parametros?: { + [k: string]: string + } +}) => ( + sess: tipoOpSessao, +) => ( + level: tipoLevel, + mensagem: string, + op_tipoLog?: tipoLog, +) => Promise<[objeto: tipoLokiObjeto, erro?: string]> + +export const logger: tipoLogger = + ({ app: app_e, eProducao, parametros: parametrosAmbiente }) => + ({ inquilino, usuario, parametros: parametrosSessao }) => + async (level, mensagem, op_tipoLog) => { let { __filename, detalhes, From 58bbbec925154bfe9db456ca5e94251d285bf4bb Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Thu, 27 Feb 2025 16:04:14 -0300 Subject: [PATCH 61/76] ajuste de tipagem --- dist/logger.d.ts | 6 ++++-- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 18 ++++++++++-------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index a087f56..89e1e56 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -27,12 +27,14 @@ type tipoLog = { [k: string]: string; }; }; -type tipoLogger = (amb: { +export type tipoLoggerLog = (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise<[objeto: tipoLokiObjeto, erro?: string]>; +export type TipoLoggerSessao = (sess: tipoOpSessao) => tipoLoggerLog; +export type tipoLogger = (amb: { app: string; eProducao: boolean; parametros?: { [k: string]: string; }; -}) => (sess: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise<[objeto: tipoLokiObjeto, erro?: string]>; +}) => TipoLoggerSessao; export declare const logger: tipoLogger; export {}; diff --git a/dist/logger.js.map b/dist/logger.js.map index 58cef3d..ec2ea6c 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index f3e0d8a..343d999 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.97.0", + "version": "0.98.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index c4acda6..ee14434 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -51,19 +51,21 @@ type tipoLog = { parametros?: { [k: string]: string } } -type tipoLogger = (amb: { +export type tipoLoggerLog = ( + level: tipoLevel, + mensagem: string, + op_tipoLog?: tipoLog, +) => Promise<[objeto: tipoLokiObjeto, erro?: string]> + +export type TipoLoggerSessao = (sess: tipoOpSessao) => tipoLoggerLog + +export type tipoLogger = (amb: { app: string eProducao: boolean parametros?: { [k: string]: string } -}) => ( - sess: tipoOpSessao, -) => ( - level: tipoLevel, - mensagem: string, - op_tipoLog?: tipoLog, -) => Promise<[objeto: tipoLokiObjeto, erro?: string]> +}) => TipoLoggerSessao export const logger: tipoLogger = ({ app: app_e, eProducao, parametros: parametrosAmbiente }) => From 45e634f7e20cd27e98d9b2a485a68822dea7aa13 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 3 Mar 2025 18:40:39 -0300 Subject: [PATCH 62/76] =?UTF-8?q?corre=C3=A7=C3=A3o=20em=20logger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/logger.js | 9 ++++++--- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 9 ++++++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dist/logger.js b/dist/logger.js index 2027c3d..d4654cd 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -35,14 +35,17 @@ const logger = ({ app: app_e, eProducao, parametros: parametrosAmbiente }) => ({ __filename = __filename.replace(cwd, ""); } if (local) { - detalhes = [`${(0, variaveisComuns_1.nomeVariavel)({ local })}="${local}"`]; + detalhes = [`${(0, variaveisComuns_1.nomeVariavel)({ local })}="${local}"`, ...(detalhes || [])]; } if (__filename) { - detalhes = [`${(0, variaveisComuns_1.nomeVariavel)({ __filename })}="${__filename}"`]; + detalhes = [ + `${(0, variaveisComuns_1.nomeVariavel)({ __filename })}="${__filename}"`, + ...(detalhes || []), + ]; } const timestamp = `${Date.now()}000000`; const mainLog = detalhes?.length - ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" | ")}` : mensagem; const payload = { stream: { diff --git a/dist/logger.js.map b/dist/logger.js.map index ec2ea6c..c7510ff 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 343d999..63d90af 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.98.0", + "version": "0.100.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index ee14434..609cbfe 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -85,17 +85,20 @@ export const logger: tipoLogger = } if (local) { - detalhes = [`${nomeVariavel({ local })}="${local}"`] + detalhes = [`${nomeVariavel({ local })}="${local}"`, ...(detalhes || [])] } if (__filename) { - detalhes = [`${nomeVariavel({ __filename })}="${__filename}"`] + detalhes = [ + `${nomeVariavel({ __filename })}="${__filename}"`, + ...(detalhes || []), + ] } const timestamp = `${Date.now()}000000` const mainLog = detalhes?.length - ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" | ")}` : mensagem const payload: tipoLokiObjeto["streams"][number] = { From 7d4fe4ad61515c36c140ced4af5d5eac89b552c2 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 10 Mar 2025 16:31:01 -0300 Subject: [PATCH 63/76] noAsyncPromiseExecutor --- Documentos/biome.json | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentos/biome.json b/Documentos/biome.json index b81b01f..3c496b0 100644 --- a/Documentos/biome.json +++ b/Documentos/biome.json @@ -12,7 +12,8 @@ "noDoubleEquals": "off", "noExplicitAny": "off", "noDebugger": "off", - "noApproximativeNumericConstant": "off" + "noApproximativeNumericConstant": "off", + "noAsyncPromiseExecutor": "off" }, "style": { "noUselessElse": "off" diff --git a/package.json b/package.json index 63d90af..8dec6f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.100.0", + "version": "0.101.0", "description": "", "main": "dist/index.js", "scripts": { From 2cdac5c9703376ab4e90e7f6df94aca0682c03eb Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sun, 23 Mar 2025 08:47:15 -0300 Subject: [PATCH 64/76] melhorias na tipagem de rotas --- dist/tipagemRotas.d.ts | 6 +++++- dist/tipagemRotas.js | 14 ++++++++++---- dist/tipagemRotas.js.map | 2 +- package.json | 2 +- src/tipagemRotas.ts | 17 +++++++++++++---- 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dist/tipagemRotas.d.ts b/dist/tipagemRotas.d.ts index 96560a4..0f530f6 100644 --- a/dist/tipagemRotas.d.ts +++ b/dist/tipagemRotas.d.ts @@ -12,10 +12,14 @@ export declare class TipagemRotas { _partesCaminho: string[]; + _acaoIr: undefined | ((endereco: string) => undefined); /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial ** export const mCaminho = new TipagemRotas<{q:string}>("aplicacao","funcionalidade") */ - constructor(...caminhos: string[]); + constructor({ caminhos, acaoIr, }: { + caminhos: string[] | string; + acaoIr: (endereco: string) => undefined; + }); /** Retorna o caminho completo da rota ** console.log(mCaminho.caminho) ** "/caminho" diff --git a/dist/tipagemRotas.js b/dist/tipagemRotas.js index fa78c21..1e8ce03 100644 --- a/dist/tipagemRotas.js +++ b/dist/tipagemRotas.js @@ -15,9 +15,10 @@ class TipagemRotas { /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial ** export const mCaminho = new TipagemRotas<{q:string}>("aplicacao","funcionalidade") */ - constructor(...caminhos) { + constructor({ caminhos, acaoIr, }) { this._partesCaminho = []; - caminhos.forEach((caminho) => { + this._acaoIr = acaoIr; + [Array.isArray(caminhos) ? caminhos : [caminhos]].forEach((caminho) => { String(caminho) .split("/") .forEach((parte) => { @@ -71,8 +72,13 @@ class TipagemRotas { ** window.location.href = "http://localhost:3000/caminho?q=query" */ ir(query) { - if (typeof window != "undefined") { - window.location.href = this.endereco(query); + if (this._acaoIr) { + this._acaoIr(this.endereco(query)); + } + else { + if (typeof window != "undefined") { + window.location.href = this.endereco(query); + } } } /** Retorna os parametros da url diff --git a/dist/tipagemRotas.js.map b/dist/tipagemRotas.js.map index 69b80c6..ac007a4 100644 --- a/dist/tipagemRotas.js.map +++ b/dist/tipagemRotas.js.map @@ -1 +1 @@ -{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 8dec6f5..2b2e8e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.101.0", + "version": "0.102.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/tipagemRotas.ts b/src/tipagemRotas.ts index dec98b9..7e09e02 100644 --- a/src/tipagemRotas.ts +++ b/src/tipagemRotas.ts @@ -11,12 +11,17 @@ export class TipagemRotas { _partesCaminho: string[] = [] + _acaoIr: undefined | ((endereco: string) => undefined) /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial ** export const mCaminho = new TipagemRotas<{q:string}>("aplicacao","funcionalidade") */ - constructor(...caminhos: string[]) { - caminhos.forEach((caminho) => { + constructor({ + caminhos, + acaoIr, + }: { caminhos: string[] | string; acaoIr: (endereco: string) => undefined }) { + this._acaoIr = acaoIr + ;[Array.isArray(caminhos) ? caminhos : [caminhos]].forEach((caminho) => { String(caminho) .split("/") .forEach((parte) => { @@ -86,8 +91,12 @@ export class TipagemRotas { ** window.location.href = "http://localhost:3000/caminho?q=query" */ ir(query: T) { - if (typeof window != "undefined") { - window.location.href = this.endereco(query) + if (this._acaoIr) { + this._acaoIr(this.endereco(query)) + } else { + if (typeof window != "undefined") { + window.location.href = this.endereco(query) + } } } From 04005d20eaa9cf4b5efb7384b9076399fd05ea5e Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 24 Mar 2025 16:27:55 -0300 Subject: [PATCH 65/76] build --- dist/tipagemRotas.d.ts | 2 +- package.json | 2 +- src/tipagemRotas.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/tipagemRotas.d.ts b/dist/tipagemRotas.d.ts index 0f530f6..c19a9d1 100644 --- a/dist/tipagemRotas.d.ts +++ b/dist/tipagemRotas.d.ts @@ -12,7 +12,7 @@ export declare class TipagemRotas { _partesCaminho: string[]; - _acaoIr: undefined | ((endereco: string) => undefined); + _acaoIr?: undefined | ((endereco: string) => undefined); /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial ** export const mCaminho = new TipagemRotas<{q:string}>("aplicacao","funcionalidade") */ diff --git a/package.json b/package.json index 2b2e8e4..58d50b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.102.0", + "version": "0.103.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/tipagemRotas.ts b/src/tipagemRotas.ts index 7e09e02..aecd1eb 100644 --- a/src/tipagemRotas.ts +++ b/src/tipagemRotas.ts @@ -11,7 +11,7 @@ export class TipagemRotas { _partesCaminho: string[] = [] - _acaoIr: undefined | ((endereco: string) => undefined) + _acaoIr?: undefined | ((endereco: string) => undefined) /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial ** export const mCaminho = new TipagemRotas<{q:string}>("aplicacao","funcionalidade") From d628f0fc325c50240287978db280c519701215ba Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 24 Mar 2025 19:37:53 -0300 Subject: [PATCH 66/76] build --- dist/tipagemRotas.d.ts | 4 ++-- dist/tipagemRotas.js.map | 2 +- package.json | 2 +- src/tipagemRotas.ts | 7 +++++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dist/tipagemRotas.d.ts b/dist/tipagemRotas.d.ts index c19a9d1..31a458e 100644 --- a/dist/tipagemRotas.d.ts +++ b/dist/tipagemRotas.d.ts @@ -12,13 +12,13 @@ export declare class TipagemRotas { _partesCaminho: string[]; - _acaoIr?: undefined | ((endereco: string) => undefined); + _acaoIr?: (endereco: string) => undefined; /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial ** export const mCaminho = new TipagemRotas<{q:string}>("aplicacao","funcionalidade") */ constructor({ caminhos, acaoIr, }: { caminhos: string[] | string; - acaoIr: (endereco: string) => undefined; + acaoIr?: undefined | ((endereco: string) => undefined); }); /** Retorna o caminho completo da rota ** console.log(mCaminho.caminho) diff --git a/dist/tipagemRotas.js.map b/dist/tipagemRotas.js.map index ac007a4..d3eb56e 100644 --- a/dist/tipagemRotas.js.map +++ b/dist/tipagemRotas.js.map @@ -1 +1 @@ -{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 58d50b6..a4bc923 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.103.0", + "version": "0.105.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/tipagemRotas.ts b/src/tipagemRotas.ts index aecd1eb..7e50021 100644 --- a/src/tipagemRotas.ts +++ b/src/tipagemRotas.ts @@ -11,7 +11,7 @@ export class TipagemRotas { _partesCaminho: string[] = [] - _acaoIr?: undefined | ((endereco: string) => undefined) + _acaoIr?: (endereco: string) => undefined /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial ** export const mCaminho = new TipagemRotas<{q:string}>("aplicacao","funcionalidade") @@ -19,7 +19,10 @@ export class TipagemRotas { constructor({ caminhos, acaoIr, - }: { caminhos: string[] | string; acaoIr: (endereco: string) => undefined }) { + }: { + caminhos: string[] | string + acaoIr?: undefined | ((endereco: string) => undefined) + }) { this._acaoIr = acaoIr ;[Array.isArray(caminhos) ? caminhos : [caminhos]].forEach((caminho) => { String(caminho) From 457973873b08fe006e8bf8165d0c738fe04ebb2b Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Fri, 28 Mar 2025 10:07:37 -0300 Subject: [PATCH 67/76] melhoria em tipagem rota --- dist/tipagemRotas.d.ts | 4 ++-- dist/tipagemRotas.js | 20 +++++--------------- dist/tipagemRotas.js.map | 2 +- package.json | 2 +- src/tipagemRotas.ts | 23 +++++++---------------- 5 files changed, 16 insertions(+), 35 deletions(-) diff --git a/dist/tipagemRotas.d.ts b/dist/tipagemRotas.d.ts index 31a458e..5705b77 100644 --- a/dist/tipagemRotas.d.ts +++ b/dist/tipagemRotas.d.ts @@ -16,8 +16,8 @@ export declare class TipagemRotas("aplicacao","funcionalidade") */ - constructor({ caminhos, acaoIr, }: { - caminhos: string[] | string; + constructor({ caminho, acaoIr, }: { + caminho: string[] | string; acaoIr?: undefined | ((endereco: string) => undefined); }); /** Retorna o caminho completo da rota diff --git a/dist/tipagemRotas.js b/dist/tipagemRotas.js index 1e8ce03..7b982f2 100644 --- a/dist/tipagemRotas.js +++ b/dist/tipagemRotas.js @@ -15,29 +15,19 @@ class TipagemRotas { /** Ao criar novo obijeto de tipagem de rota é necessário passar o caminho parcial ** export const mCaminho = new TipagemRotas<{q:string}>("aplicacao","funcionalidade") */ - constructor({ caminhos, acaoIr, }) { + constructor({ caminho, acaoIr, }) { this._partesCaminho = []; this._acaoIr = acaoIr; - [Array.isArray(caminhos) ? caminhos : [caminhos]].forEach((caminho) => { - String(caminho) - .split("/") - .forEach((parte) => { - if (parte) { - this._partesCaminho.push(parte); - } - }); - }); + this._partesCaminho = (Array.isArray(caminho) ? caminho : [caminho]) + .flatMap((a) => a.split("/")) + .filter(Boolean); } /** Retorna o caminho completo da rota ** console.log(mCaminho.caminho) ** "/caminho" */ get caminho() { - let ret = `/${this._partesCaminho.join("/")}`; - ret = ret.replace(/\/+/g, "/"); - if (ret.length > 1 && ret.endsWith("/")) { - ret = ret.slice(0, -1); - } + const ret = `/${this._partesCaminho.join("/")}`; return ret; } /** Define o caminho completo da rota diff --git a/dist/tipagemRotas.js.map b/dist/tipagemRotas.js.map index d3eb56e..93d5f07 100644 --- a/dist/tipagemRotas.js.map +++ b/dist/tipagemRotas.js.map @@ -1 +1 @@ -{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"tipagemRotas.js","sourceRoot":"","sources":["../src/tipagemRotas.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index a4bc923..1453526 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.105.0", + "version": "0.106.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/tipagemRotas.ts b/src/tipagemRotas.ts index 7e50021..e2291b5 100644 --- a/src/tipagemRotas.ts +++ b/src/tipagemRotas.ts @@ -17,22 +17,17 @@ export class TipagemRotas { ** export const mCaminho = new TipagemRotas<{q:string}>("aplicacao","funcionalidade") */ constructor({ - caminhos, + caminho, acaoIr, }: { - caminhos: string[] | string + caminho: string[] | string acaoIr?: undefined | ((endereco: string) => undefined) }) { this._acaoIr = acaoIr - ;[Array.isArray(caminhos) ? caminhos : [caminhos]].forEach((caminho) => { - String(caminho) - .split("/") - .forEach((parte) => { - if (parte) { - this._partesCaminho.push(parte) - } - }) - }) + + this._partesCaminho = (Array.isArray(caminho) ? caminho : [caminho]) + .flatMap((a) => a.split("/")) + .filter(Boolean) } /** Retorna o caminho completo da rota @@ -40,11 +35,7 @@ export class TipagemRotas { ** "/caminho" */ get caminho() { - let ret = `/${this._partesCaminho.join("/")}` - ret = ret.replace(/\/+/g, "/") - if (ret.length > 1 && ret.endsWith("/")) { - ret = ret.slice(0, -1) - } + const ret = `/${this._partesCaminho.join("/")}` return ret } /** Define o caminho completo da rota From fa98ea61cdd38541b8550803071811c4594107c0 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Fri, 28 Mar 2025 17:08:58 -0300 Subject: [PATCH 68/76] . --- dist/constantes.d.ts | 2 +- dist/constantes.js | 2 +- dist/constantes.js.map | 2 +- package.json | 2 +- src/constantes.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/constantes.d.ts b/dist/constantes.d.ts index 9ea5e6e..1bedbc1 100644 --- a/dist/constantes.d.ts +++ b/dist/constantes.d.ts @@ -7,7 +7,7 @@ export declare enum camposComuns { data_hora_atualizacao = "data_hora_atualizacao", codigo_usuario_criacao = "codigo_usuario_criacao", codigo_usuario_atualizacao = "codigo_usuario_atualizacao", - versao = "__versao" + versao = "versao" } /** Palavras comumente usadas */ export declare enum tx { diff --git a/dist/constantes.js b/dist/constantes.js index 53bb10c..e6ffa74 100644 --- a/dist/constantes.js +++ b/dist/constantes.js @@ -11,7 +11,7 @@ var camposComuns; camposComuns["data_hora_atualizacao"] = "data_hora_atualizacao"; camposComuns["codigo_usuario_criacao"] = "codigo_usuario_criacao"; camposComuns["codigo_usuario_atualizacao"] = "codigo_usuario_atualizacao"; - camposComuns["versao"] = "__versao"; + camposComuns["versao"] = "versao"; })(camposComuns || (exports.camposComuns = camposComuns = {})); /** Palavras comumente usadas */ var tx; diff --git a/dist/constantes.js.map b/dist/constantes.js.map index 68de555..8dc7670 100644 --- a/dist/constantes.js.map +++ b/dist/constantes.js.map @@ -1 +1 @@ -{"version":3,"file":"constantes.js","sourceRoot":"","sources":["../src/constantes.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,sCAAsC,CAAA;AAE/D,8CAA8C;AAC9C,IAAY,YAQX;AARD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,uDAAuC,CAAA;IACvC,+DAA+C,CAAA;IAC/C,iEAAiD,CAAA;IACjD,yEAAyD,CAAA;IACzD,mCAAmB,CAAA;AACrB,CAAC,EARW,YAAY,4BAAZ,YAAY,QAQvB;AAED,gCAAgC;AAChC,IAAY,EAEX;AAFD,WAAY,EAAE;IACZ,qBAAe,CAAA;AACjB,CAAC,EAFW,EAAE,kBAAF,EAAE,QAEb;AAED,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,0CAAmB,CAAA;IACnB,gDAAyB,CAAA;AAC3B,CAAC,EAHW,mBAAmB,mCAAnB,mBAAmB,QAG9B"} \ No newline at end of file +{"version":3,"file":"constantes.js","sourceRoot":"","sources":["../src/constantes.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG,sCAAsC,CAAA;AAE/D,8CAA8C;AAC9C,IAAY,YAQX;AARD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,uDAAuC,CAAA;IACvC,+DAA+C,CAAA;IAC/C,iEAAiD,CAAA;IACjD,yEAAyD,CAAA;IACzD,iCAAiB,CAAA;AACnB,CAAC,EARW,YAAY,4BAAZ,YAAY,QAQvB;AAED,gCAAgC;AAChC,IAAY,EAEX;AAFD,WAAY,EAAE;IACZ,qBAAe,CAAA;AACjB,CAAC,EAFW,EAAE,kBAAF,EAAE,QAEb;AAED,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,0CAAmB,CAAA;IACnB,gDAAyB,CAAA;AAC3B,CAAC,EAHW,mBAAmB,mCAAnB,mBAAmB,QAG9B"} \ No newline at end of file diff --git a/package.json b/package.json index 1453526..98e0272 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.106.0", + "version": "0.107.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/constantes.ts b/src/constantes.ts index 67b9f65..cacf79a 100644 --- a/src/constantes.ts +++ b/src/constantes.ts @@ -8,7 +8,7 @@ export enum camposComuns { data_hora_atualizacao = "data_hora_atualizacao", codigo_usuario_criacao = "codigo_usuario_criacao", codigo_usuario_atualizacao = "codigo_usuario_atualizacao", - versao = "__versao", + versao = "versao", } /** Palavras comumente usadas */ From 62fc372bfdb6ed0744172ade5119dc2c9117f9b3 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 30 Jun 2025 12:30:04 -0300 Subject: [PATCH 69/76] . --- pnpm-lock.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1c07024..fdb72b7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,10 +20,10 @@ importers: version: 1.9.4 '@types/node': specifier: ^20.16.10 - version: 20.17.19 + version: 20.19.2 typescript: specifier: ^5.7.2 - version: 5.7.3 + version: 5.8.3 packages: @@ -80,8 +80,8 @@ packages: cpu: [x64] os: [win32] - '@types/node@20.17.19': - resolution: {integrity: sha512-LEwC7o1ifqg/6r2gn9Dns0f1rhK+fPFDoMiceTJ6kWmVk6bgXBI/9IOWfVan4WiAavK9pIVWdX0/e3J+eEUh5A==} + '@types/node@20.19.2': + resolution: {integrity: sha512-9pLGGwdzOUBDYi0GNjM97FIA+f92fqSke6joWeBjWXllfNxZBs7qeMF7tvtOIsbY45xkWkxrdwUfUf3MnQa9gA==} cross-fetch@4.1.0: resolution: {integrity: sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw==} @@ -98,13 +98,13 @@ packages: tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} - typescript@5.7.3: - resolution: {integrity: sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==} + typescript@5.8.3: + resolution: {integrity: sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==} engines: {node: '>=14.17'} hasBin: true - undici-types@6.19.8: - resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + undici-types@6.21.0: + resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} @@ -152,9 +152,9 @@ snapshots: '@biomejs/cli-win32-x64@1.9.4': optional: true - '@types/node@20.17.19': + '@types/node@20.19.2': dependencies: - undici-types: 6.19.8 + undici-types: 6.21.0 cross-fetch@4.1.0: dependencies: @@ -168,9 +168,9 @@ snapshots: tr46@0.0.3: {} - typescript@5.7.3: {} + typescript@5.8.3: {} - undici-types@6.19.8: {} + undici-types@6.21.0: {} webidl-conversions@3.0.1: {} From fa33b5c23f8468d68385403b896e03072b0b32ef Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 30 Jun 2025 12:32:10 -0300 Subject: [PATCH 70/76] . --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 98e0272..2201f77 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.107.0", + "version": "0.108.0", "description": "", "main": "dist/index.js", "scripts": { From eb88195f6a25edc93a21b82c83224c0b6fac4023 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 30 Jun 2025 12:39:02 -0300 Subject: [PATCH 71/76] ajuste no biome --- Documentos/biome.json | 16 ++++++--- biome.json | 18 ++++++++-- dist/index.d.ts | 12 +++---- dist/index.js | 12 +++---- dist/index.js.map | 2 +- dist/logger.js | 4 +-- dist/logger.js.map | 2 +- dist/texto_busca.js | 1 - dist/texto_busca.js.map | 2 +- package.json | 4 +-- pnpm-lock.yaml | 76 ++++++++++++++++++++--------------------- src/index.ts | 12 +++---- src/logger.ts | 9 +++-- src/texto_busca.ts | 1 - 14 files changed, 93 insertions(+), 78 deletions(-) diff --git a/Documentos/biome.json b/Documentos/biome.json index 3c496b0..9cc72fe 100644 --- a/Documentos/biome.json +++ b/Documentos/biome.json @@ -1,11 +1,8 @@ { + "root": false, "$schema": "../node_modules/@biomejs/biome/configuration_schema.json", - "organizeImports": { - "enabled": true - }, "linter": { "enabled": true, - "rules": { "recommended": true, "suspicious": { @@ -16,7 +13,16 @@ "noAsyncPromiseExecutor": "off" }, "style": { - "noUselessElse": "off" + "noUselessElse": "off", + "noParameterAssign": "error", + "useAsConstAssertion": "error", + "useDefaultParameterLast": "error", + "useEnumInitializers": "error", + "useSelfClosingElements": "error", + "useSingleVarDeclarator": "error", + "noUnusedTemplateLiteral": "error", + "useNumberNamespace": "error", + "noInferrableTypes": "error" }, "complexity": { "noBannedTypes": "off", diff --git a/biome.json b/biome.json index 1278ee4..e4c3596 100644 --- a/biome.json +++ b/biome.json @@ -1,7 +1,21 @@ { "$schema": "node_modules/@biomejs/biome/configuration_schema.json", "extends": ["Documentos/biome.json"], - "files": { - "ignore": [] + "files": {}, + "linter": { + "rules": { + "style": { + "noParameterAssign": "error", + "useAsConstAssertion": "error", + "useDefaultParameterLast": "error", + "useEnumInitializers": "error", + "useSelfClosingElements": "error", + "useSingleVarDeclarator": "error", + "noUnusedTemplateLiteral": "error", + "useNumberNamespace": "error", + "noInferrableTypes": "error", + "noUselessElse": "error" + } + } } } diff --git a/dist/index.d.ts b/dist/index.d.ts index a769ea5..eaca916 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -1,11 +1,11 @@ +export * from "./aleatorio"; export * from "./constantes"; export * from "./consulta"; -export * from "./aleatorio"; -export * from "./texto_busca"; -export * from "./unidades_medida"; -export * from "./uuid"; export * from "./ecosistema"; -export * from "./variaveisComuns"; -export * from "./tipagemRotas"; export * from "./extensoes"; export * from "./logger"; +export * from "./texto_busca"; +export * from "./tipagemRotas"; +export * from "./unidades_medida"; +export * from "./uuid"; +export * from "./variaveisComuns"; diff --git a/dist/index.js b/dist/index.js index 423a81d..31f310d 100644 --- a/dist/index.js +++ b/dist/index.js @@ -14,15 +14,15 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) { for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); }; Object.defineProperty(exports, "__esModule", { value: true }); +__exportStar(require("./aleatorio"), exports); __exportStar(require("./constantes"), exports); __exportStar(require("./consulta"), exports); -__exportStar(require("./aleatorio"), exports); -__exportStar(require("./texto_busca"), exports); -__exportStar(require("./unidades_medida"), exports); -__exportStar(require("./uuid"), exports); __exportStar(require("./ecosistema"), exports); -__exportStar(require("./variaveisComuns"), exports); -__exportStar(require("./tipagemRotas"), exports); __exportStar(require("./extensoes"), exports); __exportStar(require("./logger"), exports); +__exportStar(require("./texto_busca"), exports); +__exportStar(require("./tipagemRotas"), exports); +__exportStar(require("./unidades_medida"), exports); +__exportStar(require("./uuid"), exports); +__exportStar(require("./variaveisComuns"), exports); //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/dist/index.js.map b/dist/index.js.map index a1b2649..eb65be1 100644 --- a/dist/index.js.map +++ b/dist/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,6CAA0B;AAC1B,8CAA2B;AAC3B,gDAA6B;AAC7B,oDAAiC;AACjC,yCAAsB;AACtB,+CAA4B;AAC5B,oDAAiC;AACjC,iDAA8B;AAC9B,8CAA2B;AAC3B,2CAAwB"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA2B;AAC3B,+CAA4B;AAC5B,6CAA0B;AAC1B,+CAA4B;AAC5B,8CAA2B;AAC3B,2CAAwB;AACxB,gDAA6B;AAC7B,iDAA8B;AAC9B,oDAAiC;AACjC,yCAAsB;AACtB,oDAAiC"} \ No newline at end of file diff --git a/dist/logger.js b/dist/logger.js index d4654cd..82d4faf 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -17,9 +17,7 @@ const postLogger = async ({ objeto, }) => { if (!response.ok) { return [objeto, `Erro ${response.status}: ${await response?.text?.()}`]; } - else { - return [objeto]; - } + return [objeto]; }; exports.postLogger = postLogger; let cwd = ""; diff --git a/dist/logger.js.map b/dist/logger.js.map index c7510ff..edd815a 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAUlC,MAAM,UAAU,GAAG,KAAK,EAAE,EAC/B,MAAM,GACqB,EAE3B,EAAE;IACF,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;QACpE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;KAC7B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,EAAE,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IACzE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,CAAA;IACjB,CAAC;AACH,CAAC,CAAA;AAfY,QAAA,UAAU,cAetB;AAED,IAAI,GAAG,GAAG,EAAE,CAAA;AAEZ,+CAA+C;AACxC,MAAM,SAAS,GAAG,CAAC,OAAe,EAAE,EAAE;IAC3C,GAAG,GAAG,OAAO,CAAA;AACf,CAAC,CAAA;AAFY,QAAA,SAAS,aAErB;AAiCM,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAC9D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,EAAE,CACzD,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE;IACpC,IAAI,EACF,UAAU,EACV,QAAQ,EACR,KAAK,EACL,UAAU,EAAE,aAAa,GAC1B,GAAG,UAAU,IAAI,EAAE,CAAA;IAEpB,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,KAAK,EAAE,CAAA;IAEhD,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;QACtB,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAA;IAC3E,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,QAAQ,GAAG;YACT,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG;YACjD,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC;SACpB,CAAA;IACH,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;IAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;QAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACvE,CAAC,CAAC,QAAQ,CAAA;IAEZ,MAAM,OAAO,GAAsC;QACjD,MAAM,EAAE;YACN,GAAG;YACH,SAAS;YACT,OAAO;YACP,KAAK;YACL,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC;YAC7B,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;YAC3B,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;SACzB;QACD,MAAM,EAAE;YACN;gBACE,SAAS;gBACT,OAAO,EAAE,sBAAsB;aAChC;SACF;KACF,CAAA;IAED,MAAM,MAAM,GAAmB,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAA;IAErD,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAE7C,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAzDU,QAAA,MAAM,UAyDhB"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/texto_busca.js b/dist/texto_busca.js index 3c6218a..259c6f9 100644 --- a/dist/texto_busca.js +++ b/dist/texto_busca.js @@ -7,7 +7,6 @@ const texto_busca = (...texto) => texto ? "" : String(txt) .normalize("NFD") - // biome-ignore lint/suspicious/noMisleadingCharacterClass: .replace(/[\u0300-\u036f]/g, "") .replace(/\s+/g, " ") .toLowerCase()) diff --git a/dist/texto_busca.js.map b/dist/texto_busca.js.map index 037ccc7..b3d4626 100644 --- a/dist/texto_busca.js.map +++ b/dist/texto_busca.js.map @@ -1 +1 @@ -{"version":3,"file":"texto_busca.js","sourceRoot":"","sources":["../src/texto_busca.ts"],"names":[],"mappings":";AAAA,wEAAwE;;;AAEjE,MAAM,WAAW,GAAG,CAAC,GAAG,KAAY,EAAU,EAAE,CACrD,KAAK;KACF,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACX,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS;IAC/B,CAAC,CAAC,EAAE;IACJ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;SACR,SAAS,CAAC,KAAK,CAAC;QACjB,yEAAyE;SACxE,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;SAC/B,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SACpB,WAAW,EAAE,CACrB;KACA,IAAI,CAAC,GAAG,CAAC,CAAA;AAZD,QAAA,WAAW,eAYV"} \ No newline at end of file +{"version":3,"file":"texto_busca.js","sourceRoot":"","sources":["../src/texto_busca.ts"],"names":[],"mappings":";AAAA,wEAAwE;;;AAEjE,MAAM,WAAW,GAAG,CAAC,GAAG,KAAY,EAAU,EAAE,CACrD,KAAK;KACF,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACX,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS;IAC/B,CAAC,CAAC,EAAE;IACJ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;SACR,SAAS,CAAC,KAAK,CAAC;SAChB,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;SAC/B,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SACpB,WAAW,EAAE,CACrB;KACA,IAAI,CAAC,GAAG,CAAC,CAAA;AAXD,QAAA,WAAW,eAWV"} \ No newline at end of file diff --git a/package.json b/package.json index 2201f77..b3599cf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.108.0", + "version": "0.110.0", "description": "", "main": "dist/index.js", "scripts": { @@ -19,7 +19,7 @@ "zod": "3.24.1" }, "devDependencies": { - "@biomejs/biome": "^1.9.4", + "@biomejs/biome": "^2.0.6", "@types/node": "^20.16.10", "typescript": "^5.7.2" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fdb72b7..0388cc5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,9 @@ importers: .: dependencies: + '@biomejs/biome': + specifier: ^2.0.6 + version: 2.0.6 cross-fetch: specifier: ^4.1.0 version: 4.1.0 @@ -15,9 +18,6 @@ importers: specifier: 3.24.1 version: 3.24.1 devDependencies: - '@biomejs/biome': - specifier: ^1.9.4 - version: 1.9.4 '@types/node': specifier: ^20.16.10 version: 20.19.2 @@ -27,55 +27,55 @@ importers: packages: - '@biomejs/biome@1.9.4': - resolution: {integrity: sha512-1rkd7G70+o9KkTn5KLmDYXihGoTaIGO9PIIN2ZB7UJxFrWw04CZHPYiMRjYsaDvVV7hP1dYNRLxSANLaBFGpog==} + '@biomejs/biome@2.0.6': + resolution: {integrity: sha512-RRP+9cdh5qwe2t0gORwXaa27oTOiQRQvrFf49x2PA1tnpsyU7FIHX4ZOFMtBC4QNtyWsN7Dqkf5EDbg4X+9iqA==} engines: {node: '>=14.21.3'} hasBin: true - '@biomejs/cli-darwin-arm64@1.9.4': - resolution: {integrity: sha512-bFBsPWrNvkdKrNCYeAp+xo2HecOGPAy9WyNyB/jKnnedgzl4W4Hb9ZMzYNbf8dMCGmUdSavlYHiR01QaYR58cw==} + '@biomejs/cli-darwin-arm64@2.0.6': + resolution: {integrity: sha512-AzdiNNjNzsE6LfqWyBvcL29uWoIuZUkndu+wwlXW13EKcBHbbKjNQEZIJKYDc6IL+p7bmWGx3v9ZtcRyIoIz5A==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [darwin] - '@biomejs/cli-darwin-x64@1.9.4': - resolution: {integrity: sha512-ngYBh/+bEedqkSevPVhLP4QfVPCpb+4BBe2p7Xs32dBgs7rh9nY2AIYUL6BgLw1JVXV8GlpKmb/hNiuIxfPfZg==} + '@biomejs/cli-darwin-x64@2.0.6': + resolution: {integrity: sha512-wJjjP4E7bO4WJmiQaLnsdXMa516dbtC6542qeRkyJg0MqMXP0fvs4gdsHhZ7p9XWTAmGIjZHFKXdsjBvKGIJJQ==} engines: {node: '>=14.21.3'} cpu: [x64] os: [darwin] - '@biomejs/cli-linux-arm64-musl@1.9.4': - resolution: {integrity: sha512-v665Ct9WCRjGa8+kTr0CzApU0+XXtRgwmzIf1SeKSGAv+2scAlW6JR5PMFo6FzqqZ64Po79cKODKf3/AAmECqA==} + '@biomejs/cli-linux-arm64-musl@2.0.6': + resolution: {integrity: sha512-CVPEMlin3bW49sBqLBg2x016Pws7eUXA27XYDFlEtponD0luYjg2zQaMJ2nOqlkKG9fqzzkamdYxHdMDc2gZFw==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-arm64@1.9.4': - resolution: {integrity: sha512-fJIW0+LYujdjUgJJuwesP4EjIBl/N/TcOX3IvIHJQNsAqvV2CHIogsmA94BPG6jZATS4Hi+xv4SkBBQSt1N4/g==} + '@biomejs/cli-linux-arm64@2.0.6': + resolution: {integrity: sha512-ZSVf6TYo5rNMUHIW1tww+rs/krol7U5A1Is/yzWyHVZguuB0lBnIodqyFuwCNqG9aJGyk7xIMS8HG0qGUPz0SA==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [linux] - '@biomejs/cli-linux-x64-musl@1.9.4': - resolution: {integrity: sha512-gEhi/jSBhZ2m6wjV530Yy8+fNqG8PAinM3oV7CyO+6c3CEh16Eizm21uHVsyVBEB6RIM8JHIl6AGYCv6Q6Q9Tg==} + '@biomejs/cli-linux-x64-musl@2.0.6': + resolution: {integrity: sha512-mKHE/e954hR/hSnAcJSjkf4xGqZc/53Kh39HVW1EgO5iFi0JutTN07TSjEMg616julRtfSNJi0KNyxvc30Y4rQ==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-linux-x64@1.9.4': - resolution: {integrity: sha512-lRCJv/Vi3Vlwmbd6K+oQ0KhLHMAysN8lXoCI7XeHlxaajk06u7G+UsFSO01NAs5iYuWKmVZjmiOzJ0OJmGsMwg==} + '@biomejs/cli-linux-x64@2.0.6': + resolution: {integrity: sha512-geM1MkHTV1Kh2Cs/Xzot9BOF3WBacihw6bkEmxkz4nSga8B9/hWy5BDiOG3gHDGIBa8WxT0nzsJs2f/hPqQIQw==} engines: {node: '>=14.21.3'} cpu: [x64] os: [linux] - '@biomejs/cli-win32-arm64@1.9.4': - resolution: {integrity: sha512-tlbhLk+WXZmgwoIKwHIHEBZUwxml7bRJgk0X2sPyNR3S93cdRq6XulAZRQJ17FYGGzWne0fgrXBKpl7l4M87Hg==} + '@biomejs/cli-win32-arm64@2.0.6': + resolution: {integrity: sha512-290V4oSFoKaprKE1zkYVsDfAdn0An5DowZ+GIABgjoq1ndhvNxkJcpxPsiYtT7slbVe3xmlT0ncdfOsN7KruzA==} engines: {node: '>=14.21.3'} cpu: [arm64] os: [win32] - '@biomejs/cli-win32-x64@1.9.4': - resolution: {integrity: sha512-8Y5wMhVIPaWe6jw2H+KlEm4wP/f7EW3810ZLmDlrEEy5KvBsb9ECEfu/kMWD484ijfQ8+nIi0giMgu9g1UAuuA==} + '@biomejs/cli-win32-x64@2.0.6': + resolution: {integrity: sha512-bfM1Bce0d69Ao7pjTjUS+AWSZ02+5UHdiAP85Th8e9yV5xzw6JrHXbL5YWlcEKQ84FIZMdDc7ncuti1wd2sdbw==} engines: {node: '>=14.21.3'} cpu: [x64] os: [win32] @@ -117,39 +117,39 @@ packages: snapshots: - '@biomejs/biome@1.9.4': + '@biomejs/biome@2.0.6': optionalDependencies: - '@biomejs/cli-darwin-arm64': 1.9.4 - '@biomejs/cli-darwin-x64': 1.9.4 - '@biomejs/cli-linux-arm64': 1.9.4 - '@biomejs/cli-linux-arm64-musl': 1.9.4 - '@biomejs/cli-linux-x64': 1.9.4 - '@biomejs/cli-linux-x64-musl': 1.9.4 - '@biomejs/cli-win32-arm64': 1.9.4 - '@biomejs/cli-win32-x64': 1.9.4 + '@biomejs/cli-darwin-arm64': 2.0.6 + '@biomejs/cli-darwin-x64': 2.0.6 + '@biomejs/cli-linux-arm64': 2.0.6 + '@biomejs/cli-linux-arm64-musl': 2.0.6 + '@biomejs/cli-linux-x64': 2.0.6 + '@biomejs/cli-linux-x64-musl': 2.0.6 + '@biomejs/cli-win32-arm64': 2.0.6 + '@biomejs/cli-win32-x64': 2.0.6 - '@biomejs/cli-darwin-arm64@1.9.4': + '@biomejs/cli-darwin-arm64@2.0.6': optional: true - '@biomejs/cli-darwin-x64@1.9.4': + '@biomejs/cli-darwin-x64@2.0.6': optional: true - '@biomejs/cli-linux-arm64-musl@1.9.4': + '@biomejs/cli-linux-arm64-musl@2.0.6': optional: true - '@biomejs/cli-linux-arm64@1.9.4': + '@biomejs/cli-linux-arm64@2.0.6': optional: true - '@biomejs/cli-linux-x64-musl@1.9.4': + '@biomejs/cli-linux-x64-musl@2.0.6': optional: true - '@biomejs/cli-linux-x64@1.9.4': + '@biomejs/cli-linux-x64@2.0.6': optional: true - '@biomejs/cli-win32-arm64@1.9.4': + '@biomejs/cli-win32-arm64@2.0.6': optional: true - '@biomejs/cli-win32-x64@1.9.4': + '@biomejs/cli-win32-x64@2.0.6': optional: true '@types/node@20.19.2': diff --git a/src/index.ts b/src/index.ts index 743bb1d..c61ba3a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,11 +1,11 @@ +export * from "./aleatorio" export * from "./constantes" export * from "./consulta" -export * from "./aleatorio" -export * from "./texto_busca" -export * from "./unidades_medida" -export * from "./uuid" export * from "./ecosistema" -export * from "./variaveisComuns" -export * from "./tipagemRotas" export * from "./extensoes" export * from "./logger" +export * from "./texto_busca" +export * from "./tipagemRotas" +export * from "./unidades_medida" +export * from "./uuid" +export * from "./variaveisComuns" diff --git a/src/logger.ts b/src/logger.ts index 609cbfe..7dec9f1 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -14,9 +14,9 @@ export type tipoLokiObjeto = { export const postLogger = async ({ objeto, -}: { objeto: tipoLokiObjeto }): Promise< - [objeto: tipoLokiObjeto, erro?: string] -> => { +}: { + objeto: tipoLokiObjeto +}): Promise<[objeto: tipoLokiObjeto, erro?: string]> => { const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { method: "POST", headers: { "Content-Type": "application/json" }, @@ -24,9 +24,8 @@ export const postLogger = async ({ }).catch((a) => a) if (!response.ok) { return [objeto, `Erro ${response.status}: ${await response?.text?.()}`] - } else { - return [objeto] } + return [objeto] } let cwd = "" diff --git a/src/texto_busca.ts b/src/texto_busca.ts index dccd8b7..3f6c1e8 100644 --- a/src/texto_busca.ts +++ b/src/texto_busca.ts @@ -7,7 +7,6 @@ export const texto_busca = (...texto: any[]): string => ? "" : String(txt) .normalize("NFD") - // biome-ignore lint/suspicious/noMisleadingCharacterClass: .replace(/[\u0300-\u036f]/g, "") .replace(/\s+/g, " ") .toLowerCase(), From 7fa14a50950b5918dc7a1cefcf2a27ad19464eb7 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 30 Jun 2025 13:22:14 -0300 Subject: [PATCH 72/76] . --- Documentos/biome.json | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentos/biome.json b/Documentos/biome.json index 9cc72fe..e52b43c 100644 --- a/Documentos/biome.json +++ b/Documentos/biome.json @@ -29,7 +29,8 @@ "noForEach": "off", "useLiteralKeys": "off", "noUselessConstructor": "off", - "useArrowFunction": "off" + "useArrowFunction": "off", + "useDateNow":"off" }, "correctness": { "noEmptyPattern": "off", diff --git a/package.json b/package.json index b3599cf..9aaf603 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.110.0", + "version": "0.111.0", "description": "", "main": "dist/index.js", "scripts": { From 9285e7787792312920c52b4c4ec11a4d6aa65c06 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 30 Jun 2025 13:24:22 -0300 Subject: [PATCH 73/76] . --- Documentos/biome.json | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentos/biome.json b/Documentos/biome.json index e52b43c..85d938c 100644 --- a/Documentos/biome.json +++ b/Documentos/biome.json @@ -35,7 +35,8 @@ "correctness": { "noEmptyPattern": "off", "noUnusedVariables": "error", - "noUnusedImports": "error" + "noUnusedImports": "error", + "useExhaustiveDependencies":"off" }, "performance": { "noAccumulatingSpread": "off" diff --git a/package.json b/package.json index 9aaf603..99a2ba3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.111.0", + "version": "0.112.0", "description": "", "main": "dist/index.js", "scripts": { From b26c1d11f4f80f0ac2072c4ccba7744a4c99f224 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 30 Jun 2025 13:26:17 -0300 Subject: [PATCH 74/76] . --- Documentos/biome.json | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentos/biome.json b/Documentos/biome.json index 85d938c..43b882e 100644 --- a/Documentos/biome.json +++ b/Documentos/biome.json @@ -30,7 +30,8 @@ "useLiteralKeys": "off", "noUselessConstructor": "off", "useArrowFunction": "off", - "useDateNow":"off" + "useDateNow":"off", + "noUselessFragments":"off" }, "correctness": { "noEmptyPattern": "off", diff --git a/package.json b/package.json index 99a2ba3..92b4e09 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.112.0", + "version": "0.113.0", "description": "", "main": "dist/index.js", "scripts": { From f08483bddd0caef3c91772ed8acc0ea9dd5e1593 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Tue, 1 Jul 2025 11:20:35 -0300 Subject: [PATCH 75/76] . --- Documentos/biome.json | 4 +++- package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentos/biome.json b/Documentos/biome.json index 43b882e..7c9e297 100644 --- a/Documentos/biome.json +++ b/Documentos/biome.json @@ -36,8 +36,10 @@ "correctness": { "noEmptyPattern": "off", "noUnusedVariables": "error", - "noUnusedImports": "error", + "noUnusedImports": "off", "useExhaustiveDependencies":"off" + + }, "performance": { "noAccumulatingSpread": "off" diff --git a/package.json b/package.json index 92b4e09..0d92c62 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.113.0", + "version": "0.114.0", "description": "", "main": "dist/index.js", "scripts": { From 432361afd274302bccfce44e164d361d0cb9d9f0 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Wed, 2 Jul 2025 09:21:33 -0300 Subject: [PATCH 76/76] . --- package.json | 2 +- pnpm-lock.yaml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 0d92c62..80af995 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.114.0", + "version": "0.115.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0388cc5..65adc6c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,9 +8,6 @@ importers: .: dependencies: - '@biomejs/biome': - specifier: ^2.0.6 - version: 2.0.6 cross-fetch: specifier: ^4.1.0 version: 4.1.0 @@ -18,9 +15,12 @@ importers: specifier: 3.24.1 version: 3.24.1 devDependencies: + '@biomejs/biome': + specifier: ^2.0.6 + version: 2.0.6 '@types/node': specifier: ^20.16.10 - version: 20.19.2 + version: 20.19.4 typescript: specifier: ^5.7.2 version: 5.8.3 @@ -80,8 +80,8 @@ packages: cpu: [x64] os: [win32] - '@types/node@20.19.2': - resolution: {integrity: sha512-9pLGGwdzOUBDYi0GNjM97FIA+f92fqSke6joWeBjWXllfNxZBs7qeMF7tvtOIsbY45xkWkxrdwUfUf3MnQa9gA==} + '@types/node@20.19.4': + resolution: {integrity: sha512-OP+We5WV8Xnbuvw0zC2m4qfB/BJvjyCwtNjhHdJxV1639SGSKrLmJkc3fMnp2Qy8nJyHp8RO6umxELN/dS1/EA==} cross-fetch@4.1.0: resolution: {integrity: sha512-uKm5PU+MHTootlWEY+mZ4vvXoCn4fLQxT9dSc1sXVMSFkINTJVN8cAQROpwcKm8bJ/c7rgZVIBWzH5T78sNZZw==} @@ -152,7 +152,7 @@ snapshots: '@biomejs/cli-win32-x64@2.0.6': optional: true - '@types/node@20.19.2': + '@types/node@20.19.4': dependencies: undici-types: 6.21.0