minimonolith 0.22.4 → 0.23.1

package/README.md

@@ -63,7 +63,6 @@ await API.postDatabaseService({
   DB_DB: process.env.DB_DB,
   DB_USER: process.env.DB_USER,
   DB_PASS: process.env.DB_PASS,
-  DB_STORAGE: process.env.DB_STORAGE,
 });
 
 export const lambdaHandler = await API.getSyncedHandler();
@@ -175,7 +174,7 @@ TEST_ENV=FALSE
 ## Database Authentication
 
 To set up authentication for the database you need to pass necessary variables to postDatabaseService as at index.js above.
-Assuming using same env variables as used at index.js above
+Assuming using same env variable names as at index.js above
 
 For MySQL:
 
@@ -190,16 +189,14 @@ DB_USER=<your_database_username>
 DB_PASS=<your_database_password>
 ```
 
-For SQLite:
+For SQLite in memory:
 
 ```makefile
 DEV_ENV=TRUE
 PROD_ENV=FALSE
 DB_DIALECT=sqlite
 DB_DB=<your_database_name>
-DB_STORAGE=:memory: # For in-memory SQLite database
-# Or
-DB_STORAGE=path/to/your/sqlite/file.db # For file-based SQLite database
+DB_STORAGE=:memory: # Need to also pass to API.postDatabaseService()
 ```
 
 Make sure to replace the placeholders with your actual database credentials.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "minimonolith",
   "type": "module",
-  "version": "0.22.4",
+  "version": "0.23.1",
   "main": "index.js",
   "license": "MIT",
   "scripts": {

package/src/api/getNewAPI/index.js

@@ -2,6 +2,7 @@ import getAPI from '../get/index.js';
 
 export default ({ DEV_ENV='FALSE', PROD_ENV='TRUE', TEST_ENV='FALSE' } = {}) => {
   getAPI().SERVICES = {};
+  getAPI().VALIDATORS = {};
   getAPI().SCHEMAS = {};
   getAPI().MODELS = {};
   getAPI().ORM = undefined;

package/src/api/postService/index.js

@@ -15,7 +15,7 @@ const META_SERVICE_NAME = 'API', META_METHOD_NAME = 'POST_SERVICE';
 export default async (SERVICE_NAME, SRC_FOLDER='', MODULES_FOLDER='node_modules/') => {
 
   LOG_SERVICE.post(META_SERVICE_NAME, META_METHOD_NAME, SERVICE_NAME);
-  getAPI().SERVICES[SERVICE_NAME] = {};
+  getAPI().SERVICES[SERVICE_NAME] = {}; getAPI().VALIDATORS[SERVICE_NAME] = {};
   try {
 
     const projectRootPath = PATH_SERVICE.getProjectRoot(import.meta.url, MODULES_FOLDER)+'/';

package/src/method/post/index.js

@@ -29,6 +29,11 @@ export default async (SERVICE_NAME, SERVICE_URL, METHOD_CODE) => {
       return await METHOD.CONTROLLER({ MODELS, SERVICES, ROUTE_CODE, body, claims });
     }
 
+    API_SERVICE.get().VALIDATORS[SERVICE_NAME][METHOD_NAME] = () => {
+      const { MODELS, SERVICES, VALIDATORS } = API_SERVICE.get();
+      return METHOD.VALIDATOR({ MODELS, SERVICES, VALIDATORS });
+    }
+
     const METHOD_TYPE = getType(METHOD_NAME);
 
     LOG_SERVICE.post('POSTING_ROUTE', METHOD_ROUTE);

package/src/validation/get/index.js

@@ -4,16 +4,13 @@ import { z } from 'zod';
 
 import LOG_SERVICE from '../../log/index.js';
 
-import getOptionalObject from '../getOptionalObject/index.js';
-
 export default async (METHOD_NAME, SERVICE_URL) => {
   const VALIDATION_URL = new URL(`${METHOD_NAME}/valid.js`, SERVICE_URL);
 
   if (!fs.existsSync(url.fileURLToPath(VALIDATION_URL)))
-    return EVENT_CONTEXT => z.undefined();
+    //return EVENT_CONTEXT => z.undefined();
+    return undefined;;
 
   LOG_SERVICE.post('  FOUND_VALIDATOR');
-  const Z_ELEMENTS = (await import(VALIDATION_URL)).default;
-
-  return EVENT_CONTEXT => getOptionalObject(Z_ELEMENTS(EVENT_CONTEXT));
+  return (await import(VALIDATION_URL)).default;
 };

package/src/validation/getOptionalObject/index.js

@@ -2,7 +2,7 @@ import { z } from 'zod';
 
 export default zElements => {
   const zObject = z.object(zElements).strict();
-  if (!Object.values(zElements).every(zElement => zElement.isOptional())) return zObject;
+  if (!Object.values(zElements).every(zElement => zElement.isOptional() )) return zObject;
 
   return z.custom(unifiedBody => unifiedBody===undefined ? true : zObject.parse(unifiedBody));
 }

package/src/validation/postError/index.js

@@ -1,15 +1,29 @@
 import API_SERVICE from '../../api/index.js';
 import LOG_SERVICE from '../../log/index.js';
 
+import getOptionalObject from '../getOptionalObject/index.js';
+
 export default async (res, ROUTE_CODE, VALIDATOR, input) => {
-  const { MODELS, SERVICES } = API_SERVICE.get(), EVENT_CONTEXT = { MODELS, SERVICES };
-  const VALIDATION_ERROR = (await VALIDATOR(EVENT_CONTEXT).safeParseAsync(input)).error?.format();
+  const { MODELS, SERVICES, VALIDATORS } = API_SERVICE.get(), EVENT_CONTEXT = { MODELS, SERVICES, VALIDATORS };
+
+  if (!VALIDATOR && input) {
+    const MESSAGE = { ROUTE_CODE, VALIDATION_ERROR: JSON.stringify({ message: 'BODY_NOT_ALLOWED' }) };
+    LOG_SERVICE.postError(MESSAGE);
+    res.status(400).json(MESSAGE);
+    return true;
+  }
 
-  if (!VALIDATION_ERROR) return false;
+  if (!VALIDATOR) return false;
+  
+  const VALIDATION_ERROR =
+    (await getOptionalObject(VALIDATOR(EVENT_CONTEXT)).safeParseAsync(input)).error?.format();
 
-  const MESSAGE = { ROUTE_CODE, VALIDATION_ERROR };
-  LOG_SERVICE.postError(MESSAGE);
-  res.status(400).json(MESSAGE);
+  if (VALIDATION_ERROR) {
+    const MESSAGE = { ROUTE_CODE, VALIDATION_ERROR: JSON.stringify(VALIDATION_ERROR) };
+    LOG_SERVICE.postError(MESSAGE);
+    res.status(400).json(MESSAGE);
+    return true;
+  }
 
-  return true;
+  return false
 }

package/.env.example

@@ -1,4 +0,0 @@
-MM_API_DB_DIALECT=sqlite
-MM_API_DB_STORAGE=:memory:
-MM_API_PROD_ENV=FALSE
-MM_API_DEV_ENV=TRUE