refactor: folder structure

Author: rolu01

.gitignore

@@ -131,7 +131,7 @@ dist
 
 # custom directory
 custom/resources/*
-!custom/src/node/modules/hello/*
-!custom/test/node/hello/*
+!custom/src/modules/hello/*
+!custom/test/hello/*
 uploads
 

custom/src/node/modules/hello/v1/module.js custom/src/modules/hello/v1/module.js

@@ -2,13 +2,13 @@
 
 import express from 'express';
 import dotenv from 'dotenv';
-import { run as nodeRun } from '../node/start.js';
+import { run as nodeRun } from '../start.js';
 import { resolve, join } from 'path';
 import { logger, httpLogger } from './logger.js';
 import { request } from './http-request.js';
 import { rmSync, mkdirSync, existsSync, readFileSync, writeFileSync } from 'fs';
 import path from 'path';
-import packageJson from '../../package.json' with { type: "json" };
+import packageJson from '../../package.json' assert { type: 'json' };
 
 dotenv.config();
 

custom/src/node/modules/hello/v1/package-lock.json custom/src/modules/hello/v1/package-lock.json

@@ -7,19 +7,20 @@ import Joi from 'joi';
 import { validateRoute, validateSchema } from './lib/validation.js';
 import joiToSwagger from 'joi-to-swagger';
 import { handleSingleUploadFile } from './lib/upload.js';
-import { logger } from '../lib/logger.js';
-import packageJson from '../../package.json' with { type: "json" };
+import { logger } from './lib/logger.js';
+import packageJson from '../package.json' assert { type: 'json' };
 import { url } from 'inspector';
 
-const CUSTOM_MODULES_DIR = './custom/src/node/modules';
-const SYSTEM_MODULES_DIR = './src/node/modules';
+const CUSTOM_MODULES_DIR = './custom/src/modules';
+const SYSTEM_MODULES_DIR = './src/modules';
 
 let swaggerDefinition = {
   openapi: '3.0.0',
   info: {
     title: 'Onify Functions',
-    description: '[https://github.com/onify/functions](https://github.com/onify/functions)',
-    version: packageJson.version
+    description:
+      '[https://github.com/onify/functions](https://github.com/onify/functions)',
+    version: packageJson.version,
   },
 };
 
@@ -56,9 +57,8 @@ const loadModules = async (baseDir) => {
   const modules = modulePaths.map(async (modulePath) => {
     return {
       path: modulePath,
-      module: (
-        await await import(new URL(`../../${modulePath}`, import.meta.url))
-      ).module,
+      module: (await await import(new URL(`../${modulePath}`, import.meta.url)))
+        .module,
     };
   });
 

custom/src/node/modules/hello/v1/package.json custom/src/modules/hello/v1/package.json

@@ -3,7 +3,7 @@ import { defineConfig } from 'vitest/config';
 export default defineConfig({
   test: {
     root: '.',
-    include: ['./test/node/**/*.js', './custom/test/node/**/*.js'],
+    include: ['./test/**/*.js', './custom/test/**/*.js'],
     testTimeout: 20000,
   },
 });