elseware-nodejs 1.7.3 → 1.7.5

package/dist/index.d.cts

@@ -1,8 +1,9 @@
 import * as express from 'express';
 import { Request, Response, NextFunction } from 'express';
 import { Model, PopulateOptions, Query } from 'mongoose';
-import Joi, { Schema } from 'joi';
+import { ZodSchema } from 'zod';
 import { CorsOptions } from 'cors';
+import { Schema } from 'joi';
 import { SignOptions, JwtPayload } from 'jsonwebtoken';
 
 /**
@@ -75,11 +76,10 @@ interface DatabaseConfig {
 }
 declare function connectMongoDB(config: DatabaseConfig): Promise<void>;
 
-/**
- * Generic env loader for Elseware apps
- * App provides its own Joi schema
- */
-declare function loadEnv<T>(schema: Joi.ObjectSchema<T>): T;
+declare function loadEnv(options: {
+    schema: ZodSchema;
+    transform?: (env: any) => any;
+}): any;
 
 interface LoggerOptions {
     timestamp?: boolean;

package/dist/index.d.ts

@@ -1,8 +1,9 @@
 import * as express from 'express';
 import { Request, Response, NextFunction } from 'express';
 import { Model, PopulateOptions, Query } from 'mongoose';
-import Joi, { Schema } from 'joi';
+import { ZodSchema } from 'zod';
 import { CorsOptions } from 'cors';
+import { Schema } from 'joi';
 import { SignOptions, JwtPayload } from 'jsonwebtoken';
 
 /**
@@ -75,11 +76,10 @@ interface DatabaseConfig {
 }
 declare function connectMongoDB(config: DatabaseConfig): Promise<void>;
 
-/**
- * Generic env loader for Elseware apps
- * App provides its own Joi schema
- */
-declare function loadEnv<T>(schema: Joi.ObjectSchema<T>): T;
+declare function loadEnv(options: {
+    schema: ZodSchema;
+    transform?: (env: any) => any;
+}): any;
 
 interface LoggerOptions {
     timestamp?: boolean;

package/dist/index.js

@@ -322,17 +322,31 @@ async function connectMongoDB(config) {
     process.exit(1);
   }
 }
-dotenv.config({ quiet: true });
-function loadEnv(schema) {
-  const { value, error } = schema.validate(process.env, {
-    abortEarly: false,
-    allowUnknown: true
+dotenv.config();
+function loadEnv(options) {
+  const result = options.schema.safeParse(process.env);
+  if (!result.success) {
+    handleError(result.error);
+  }
+  logger.success("\u2705 Env Configurations validated");
+  return options.transform ? options.transform(result.data) : result.data;
+}
+function handleError(error) {
+  console.error("\u274C ENV VALIDATION FAILED");
+  const grouped = {};
+  error.issues.forEach((err) => {
+    const key = err.path.join(".") || "unknown";
+    if (!grouped[key]) grouped[key] = [];
+    grouped[key].push(err.message);
   });
-  if (error) {
-    throw new Error(`\u274C Env validation error: ${error.message}`);
-  }
-  logger.success("Configurations passed");
-  return value;
+  Object.entries(grouped).forEach(([key, messages]) => {
+    console.error(`\u{1F539} ${key}`);
+    messages.forEach((msg) => {
+      console.error(`   - ${msg}`);
+    });
+  });
+  console.error("\u{1F6AB} Application startup aborted.\n");
+  process.exit(1);
 }
 
 // src/configs/cors/allowedOrigins.ts
@@ -5319,16 +5333,20 @@ var TemplateEngine = class {
   static partialsLoaded = {};
   static cssCache = {};
   static registerPartials(templateDir) {
-    const partialsDir = path.join(templateDir, "partials");
-    if (!fs3.existsSync(partialsDir) || this.partialsLoaded[templateDir]) return;
-    const files = fs3.readdirSync(partialsDir);
-    for (const file of files) {
-      if (file.endsWith(".hbs")) {
-        const name = path.basename(file, ".hbs");
-        const content = fs3.readFileSync(path.join(partialsDir, file), "utf-8");
-        Handlebars.registerPartial(name, content);
+    if (this.partialsLoaded[templateDir]) return;
+    const registerFromDir = (dirPath) => {
+      if (!fs3.existsSync(dirPath)) return;
+      const files = fs3.readdirSync(dirPath);
+      for (const file of files) {
+        if (file.endsWith(".hbs")) {
+          const name = path.basename(file, ".hbs");
+          const content = fs3.readFileSync(path.join(dirPath, file), "utf-8");
+          Handlebars.registerPartial(name, content);
+        }
       }
-    }
+    };
+    registerFromDir(path.join(templateDir, "partials"));
+    registerFromDir(path.join(templateDir, "layouts"));
     this.partialsLoaded[templateDir] = true;
   }
   static loadAllCSS(stylesDir) {