@cripty2001/utils 0.0.232 → 0.0.233

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Whispr } from "@cripty2001/whispr";
-import type { TSchema } from "@sinclair/typebox";
+import type { Static, TSchema } from "@sinclair/typebox";
 export type JSONEncodable = number | string | boolean | JSONEncodable[] | null | {
     [key: string]: JSONEncodable;
 };
@@ -121,12 +121,13 @@ export declare function getEnvInt(key: string, constraints?: {
     max?: number;
 }, defaultValue?: number): number;
 /**
- * @see getEnv, with the additional constraint that the environment variable must be a valid JSON object.
- * Note: the default value is not used instead of an invalid JSON object. An invalid JSON object therefore throws an error.
+ * @see getEnv, with the additional constraint that the environment variable must be valid JSON.
+ * Note: the default value is not used instead of invalid JSON or a schema mismatch. Those therefore throw.
  *
- * @param schema The schema to use to validate the environment variable value
+ * @param schema Optional TypeBox schema.
  */
-export declare function getEnvJson<T>(key: string, defaultValue?: T, schema?: TSchema): T;
+export declare function getEnvJson<T>(key: string, defaultValue?: T): T;
+export declare function getEnvJson<S extends TSchema>(key: string, defaultValue: Static<S> | undefined, schema: S): Static<S>;
 export declare const CURRENT_TS_MS: () => Whispr<number>;
 export declare function getClock(rate: number): Whispr<number>;
 export declare function timediff2HumanReadable(diffMs: number): string;

package/dist/index.js

@@ -24,6 +24,7 @@ exports.timediff2HumanReadable = timediff2HumanReadable;
 exports.fn2promise = fn2promise;
 exports.safeApply = safeApply;
 const whispr_1 = require("@cripty2001/whispr");
+const value_1 = require("@sinclair/typebox/value");
 const lodash_1 = require("lodash");
 const U32_LIMIT = 0x1_0000_0000;
 function randomU32() {
@@ -285,8 +286,10 @@ function getEnvString(key, allowEmpty = false, defaultValue) {
  */
 function getEnvInt(key, constraints = {}, defaultValue) {
     return getEnv(key, defaultValue, (s) => {
-        const parsed = parseInt(s);
-        if (isNaN(parsed))
+        if (!/^[+-]?\d+$/.test(s))
+            throw new GetenvHandledError(`Invalid integer.`);
+        const parsed = Number(s);
+        if (!Number.isInteger(parsed))
             throw new GetenvHandledError(`Invalid integer.`);
         const MIN = constraints.min ?? Number.MIN_SAFE_INTEGER;
         if (parsed < MIN)
@@ -297,17 +300,20 @@ function getEnvInt(key, constraints = {}, defaultValue) {
         return parsed;
     });
 }
-/**
- * @see getEnv, with the additional constraint that the environment variable must be a valid JSON object.
- * Note: the default value is not used instead of an invalid JSON object. An invalid JSON object therefore throws an error.
- *
- * @param schema The schema to use to validate the environment variable value
- */
 function getEnvJson(key, defaultValue, schema) {
-    const value = getEnv(key, defaultValue, (s) => JSON.parse(s));
-    return schema ?
-        schema.parse(value) :
-        value;
+    return getEnv(key, defaultValue, (s) => {
+        const parsed = (() => {
+            try {
+                return JSON.parse(s);
+            }
+            catch {
+                throw new GetenvHandledError(`Invalid JSON.`);
+            }
+        })();
+        if (schema === undefined)
+            return parsed;
+        return value_1.Value.Parse(schema, parsed);
+    });
 }
 const [currentTsMs, setCurrentTsMs] = whispr_1.Whispr.create(Date.now());
 let currentTsMsInterval = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cripty2001/utils",
-  "version": "0.0.232",
+  "version": "0.0.233",
   "description": "Internal Set of utils. If you need them use them, otherwise go to the next package ;)",
   "homepage": "https://github.com/cripty2001/utils#readme",
   "bugs": {