@pitininja/envious-typebox 6.0.0-beta6 → 6.0.1

package/README.md

@@ -16,6 +16,8 @@ npm i @pitininja/envious-typebox
 
 ## Usage
 
+See the [official Typebox documentation](https://sinclairzx81.github.io/typebox/) for how to write the schema.
+
 ```typescript
 import { envious } from '@pitininja/envious';
 import { typeboxResolver } from '@pitininja/envious-typebox';

package/dist/{resolvers/typebox/src/index.js → index.js}

@@ -37,30 +37,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typeboxResolver = void 0;
+const envious_1 = require("@pitininja/envious");
 const format_1 = __importDefault(require("typebox/format"));
 const value_1 = __importStar(require("typebox/value"));
-const error_1 = require("../../../common/error");
 const setTypeboxFormats = (formats) => {
     for (const [name, format] of Object.entries(formats)) {
         format_1.default.Set(name, format instanceof RegExp ? (val) => format.test(val) : format);
     }
 };
-const typeboxErrorsToEnviousErrors = (typeboxErrors) => {
-    return (0, error_1.resolverErrorsToEnviousErrors)({
-        resolverErrors: typeboxErrors,
-        transform: (typeboxError) => {
-            const { instancePath, message } = typeboxError;
-            return { name: instancePath.replace(/^\//, ''), message };
-        }
-    });
-};
 function checkIfObject(val) {
     if (!val || typeof val !== 'object') {
-        throw new error_1.EnviousError({
+        throw new envious_1.EnviousError({
             message: 'Could not parse environment variables'
         });
     }
 }
+const transformTypeboxError = (typeboxError) => {
+    const { instancePath, message } = typeboxError;
+    return {
+        name: instancePath.replace(/^\//, ''),
+        message
+    };
+};
 const typeboxResolver = ({ schema, formats }) => {
     return (env) => {
         try {
@@ -77,8 +75,9 @@ const typeboxResolver = ({ schema, formats }) => {
             checkIfObject(converted);
             const errors = value_1.default.Errors(schema, { ...converted });
             if (errors.length) {
-                throw new error_1.EnviousError({
-                    variables: typeboxErrorsToEnviousErrors(errors)
+                throw new envious_1.EnviousError({
+                    resolverErrors: errors,
+                    transform: transformTypeboxError
                 });
             }
             return value_1.default.Repair({
@@ -88,8 +87,9 @@ const typeboxResolver = ({ schema, formats }) => {
         }
         catch (err) {
             if (err instanceof value_1.AssertError) {
-                throw new error_1.EnviousError({
-                    variables: typeboxErrorsToEnviousErrors(err.cause.errors)
+                throw new envious_1.EnviousError({
+                    resolverErrors: err.cause.errors,
+                    transform: transformTypeboxError
                 });
             }
             throw err;

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkD;AAGlD,4DAAoC;AACpC,uDAAmD;AAenD,MAAM,iBAAiB,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC;IAC1D,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,gBAAM,CAAC,GAAG,CACN,IAAI,EACJ,MAAM,YAAY,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAChE,CAAC;IACN,CAAC;AAAA,CACJ,CAAC;AAEF,SAAS,aAAa,CAAC,GAAY,EAAyB;IACxD,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAClC,MAAM,IAAI,sBAAY,CAAC;YACnB,OAAO,EAAE,uCAAuC;SACnD,CAAC,CAAC;IACP,CAAC;AAAA,CACJ;AAED,MAAM,qBAAqB,GAAG,CAAC,YAAuC,EAAE,EAAE,CAAC;IACvE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IAC/C,OAAO;QACH,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;QACrC,OAAO;KACV,CAAC;AAAA,CACL,CAAC;AAEK,MAAM,eAAe,GAAG,CAAoB,EAC/C,MAAM,EACN,OAAO,EACwB,EAA6B,EAAE,CAAC;IAC/D,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACZ,IAAI,CAAC;YACD,IAAI,OAAO,EAAE,CAAC;gBACV,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC;YACD,MAAM,SAAS,GAAG,eAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnC,yHAAyH;YACzH,MAAM,OAAO,GAAG,eAAK,CAAC,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAC/C,aAAa,CAAC,OAAO,CAAC,CAAC;YACvB,MAAM,SAAS,GAAG,eAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;YACxD,aAAa,CAAC,SAAS,CAAC,CAAC;YACzB,MAAM,SAAS,GAAG,eAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;YAC1D,aAAa,CAAC,SAAS,CAAC,CAAC;YACzB,MAAM,MAAM,GAAG,eAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,GAAG,SAAS,EAAE,CAAC,CAAC;YACtD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAChB,MAAM,IAAI,sBAAY,CAAC;oBACnB,cAAc,EAAE,MAAM;oBACtB,SAAS,EAAE,qBAAqB;iBACnC,CAAC,CAAC;YACP,CAAC;YACD,OAAO,eAAK,CAAC,MAAM,CACf;gBACI,GAAG,MAAM;gBACT,oBAAoB,EAAE,KAAK;aAC9B,EACD,SAAS,CACZ,CAAC;QACN,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACpB,IAAI,GAAG,YAAY,mBAAW,EAAE,CAAC;gBAC7B,MAAM,IAAI,sBAAY,CAAC;oBACnB,cAAc,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM;oBAChC,SAAS,EAAE,qBAAqB;iBACnC,CAAC,CAAC;YACP,CAAC;YACD,MAAM,GAAG,CAAC;QACd,CAAC;IAAA,CACJ,CAAC;AAAA,CACL,CAAC;AAzCW,QAAA,eAAe,GAAf,eAAe,CAyC1B"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pitininja/envious-typebox",
-    "version": "6.0.0-beta6",
+    "version": "6.0.1",
     "license": "AGPL-3.0-or-later",
     "homepage": "https://codeberg.org/pitininja/envious",
     "repository": {
@@ -12,14 +12,16 @@
     },
     "files": [
         "./dist",
-        "./package.json"
+        "./package.json",
+        "./README.md"
     ],
-    "main": "./dist/resolvers/typebox/src/index.js",
-    "types": "./dist/resolvers/typebox/src/index.d.ts",
+    "main": "./dist/index.js",
+    "types": "./dist/index.d.ts",
     "scripts": {
-        "build": "npx tsgo --build --clean tsconfig.json && npx tsgo -b ./tsconfig.json"
+        "build": "npx tsgo --build --clean ./tsconfig.build.json && npx tsgo -b ./tsconfig.build.json"
     },
     "dependencies": {
-        "typebox": "^1.0.25"
+        "@pitininja/envious": "^6.0.0",
+        "typebox": "^1.0.0"
     }
 }

package/dist/common/error.d.ts

@@ -1,21 +0,0 @@
-export type EnviousErrorVariable = {
-    name: string;
-    messages: string[];
-};
-type EnviousErrorOptions = {
-    message?: string;
-    variables?: EnviousErrorVariable[];
-};
-export declare class EnviousError extends Error {
-    variables: EnviousErrorVariable[];
-    constructor({ message, variables }: EnviousErrorOptions);
-}
-type ResolverErrorsToEnviousErrorsOptions<T> = {
-    transform: (resolverError: T) => {
-        name: string;
-        message: string;
-    };
-    resolverErrors: T[];
-};
-export declare const resolverErrorsToEnviousErrors: <T>({ transform, resolverErrors }: ResolverErrorsToEnviousErrorsOptions<T>) => EnviousErrorVariable[];
-export {};

package/dist/common/error.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolverErrorsToEnviousErrors = exports.EnviousError = void 0;
-class EnviousError extends Error {
-    variables;
-    constructor({ message = 'Invalid environment variables', variables = [] }) {
-        super(message);
-        this.variables = variables;
-    }
-}
-exports.EnviousError = EnviousError;
-const resolverErrorsToEnviousErrors = ({ transform, resolverErrors }) => {
-    const enviousErrors = [];
-    const validationErrorsMap = new Map();
-    for (const resolverError of resolverErrors) {
-        const { name, message } = transform(resolverError);
-        const errorMessages = validationErrorsMap.get(name);
-        validationErrorsMap.set(name, [...(errorMessages ?? []), message]);
-    }
-    for (const [name, messages] of validationErrorsMap.entries()) {
-        enviousErrors.push({ name, messages });
-    }
-    return enviousErrors;
-};
-exports.resolverErrorsToEnviousErrors = resolverErrorsToEnviousErrors;
-//# sourceMappingURL=error.js.map

package/dist/common/error.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../../common/error.ts"],"names":[],"mappings":";;;AAUA,kBAA0B,SAAQ,KAAK;IACnC,SAAS,CAAyB;IAClC,YAAY,EACR,OAAO,GAAG,+BAA+B,EACzC,SAAS,GAAG,EAAE,EACI,EAAE;QACpB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAAA,CAC9B;CACJ;;AAUM,MAAM,6BAA6B,GAAG,CAAI,EAC7C,SAAS,EACT,cAAc,EACwB,EAAE,EAAE,CAAC;IAC3C,MAAM,aAAa,GAA2B,EAAE,CAAC;IACjD,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAoB,CAAC;IACxD,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;QACzC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpD,mBAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IACvE,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,mBAAmB,CAAC,OAAO,EAAE,EAAE,CAAC;QAC3D,aAAa,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,aAAa,CAAC;AAAA,CACxB,CAAC;AAfW,QAAA,6BAA6B,GAA7B,6BAA6B,CAexC"}

package/dist/resolvers/typebox/src/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/index.ts"],"names":[],"mappings":"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"}