@paralect/hive 0.1.19 → 0.1.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paralect/hive",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -13,6 +13,7 @@
     "@koa/cors": "3.1.0",
     "@koa/multer": "3.0.0",
     "@koa/router": "10.1.1",
+    "@paralect/hive": "^0.1.19",
     "@paralect/node-mongo": "2.1.1",
     "@react-email/components": "^0.0.20",
     "@react-email/render": "^0.0.16",

package/starter/src/db.js

@@ -1,8 +1,8 @@
 import fs from "fs";
 import _ from "lodash";
-import requireDir from "require-dir";
 import getSchemas from "helpers/getSchemas";
 import getResources from "helpers/getResources";
+import importHandlers from "helpers/importHandlers";
 import config from "app-config";
 import { connect } from "lib/node-mongo";
 
@@ -28,7 +28,7 @@ db.init = async () => {
       }
       db.schemas[schemaName] = schema;
       db.services[schemaName] = db.createService(`${resourceName}`, {
-        validate: (obj) => { 
+        validate: (obj) => {
           return { value: schema.passthrough().parse(obj) };
         },
       });
@@ -37,15 +37,13 @@ db.init = async () => {
   ));
 
   const resourcePaths = await getResources();
-  
+
   setTimeout(() => {
-    _.each(resourcePaths, ({ dir }) => {
-      if (fs.existsSync(`${dir}/handlers`)) {
-        requireDir(`${dir}/handlers`);
-      }
+    _.each(resourcePaths, ({ name }) => {
+      importHandlers(name)
     });
   }, 0);
-  
+
   (await import("autoMap/addHandlers")).default();
   (await import("autoMap/mapSchema")).default();
 };

package/starter/src/helpers/getResources.js

@@ -26,8 +26,7 @@ export default async () => {
 
   return resourceDirs
     .filter(({ dirName }) => dirName !== "health")
-    .map(({ dirName, isHive }) => ({
-      dir: isHive ? path.resolve(`${process.env.HIVE_SRC}/resources/${dirName}`) : path.resolve(`${__dirname}/../resources/${dirName}`),
+    .map(({ dirName }) => ({
       name: dirName,
     }));
 };

package/starter/src/helpers/getSchemas.js

@@ -1,27 +1,50 @@
-import { promises } from "fs";
+import _ from 'lodash';
+import fs, { promises } from "fs";
 import getResources from "./getResources.js";
 
 const {
   promises: { readdir },
 } = { promises };
 
+
+const getSchemas = async (resourceDir) => {
+   return (await readdir(resourceDir))
+      .filter((f) => f.includes("schema.js"))
+      .filter((f) => !f.includes("extends.schema"))
+      .map((f) => ({
+        name: f.replace(".schema.js", ""),
+        file: `${resourceDir}/${f}`,
+        resourceName: _.last(resourceDir.split('/')),
+        isHive: process.env.HIVE_SRC && resourceDir.includes(process.env.HIVE_SRC),
+      }));
+}
+
+const getResourceSchemas = async (resourceName) => {
+  let schemaFiles  = [];
+
+  if (fs.existsSync(`${process.env.HIVE_SRC}/resources/${resourceName}`)) {
+    schemaFiles = (await getSchemas(`${process.env.HIVE_SRC}/resources/${resourceName}`));
+  } 
+      
+  if (fs.existsSync(`${__dirname}/../resources/${resourceName}`)) {
+    schemaFiles = [...schemaFiles, ...(await getSchemas(`${__dirname}/../resources/${resourceName}`)).filter(schema => !schemaFiles.find(s => s.name === schema.name))];
+  }
+
+  return schemaFiles;
+};
+
 export default async () => {
   const resources = await getResources();
-  const schemas = [];
+  let schemas = [];
 
   await Promise.all(
-    resources.map(async ({ dir: resourceDir, name: resourceName }) => {
-      const resourceSchemas = (await readdir(resourceDir))
-        .filter((f) => f.includes("schema.js"))
-        .filter((f) => !f.includes("extends.schema"))
-        .map((f) => ({
-          file: `${resourceDir}/${f}`,
-          resourceName,
-          name: f.replace(".schema.js", ""),
-        }));
+    resources.map(async ({ name: resourceName }) => {
+      const resourceSchemas = await getResourceSchemas(resourceName);
       schemas.push(...resourceSchemas);
     })
   );
-  
+
+  console.log('schemas', schemas);
+
   return schemas;
 };

package/starter/src/helpers/importHandlers.js

@@ -0,0 +1,29 @@
+import fs from 'fs';
+import _ from 'lodash';
+import requireDir from "require-dir";
+
+export default (resourceName) => {
+  if (fs.existsSync(`${process.env.HIVE_SRC}/resources/${resourceName}/handlers`)) {
+    requireDir(`${process.env.HIVE_SRC}/resources/${resourceName}/handlers`, {
+      mapValue: (handler, handlerName) => {
+        console.log(
+          `[handlers] Registering handler ${handlerName}`
+        );
+
+        return handler;
+      },
+    });
+  }
+
+  if (fs.existsSync(`${__dirname}/../resources/${resourceName}/handlers`)) {
+    requireDir(`${__dirname}/../resources/${resourceName}/handlers`, {
+      mapValue: (handler, handlerName) => {
+        console.log(
+          `[handlers] Registering handler ${handlerName}`
+        );
+
+        return handler;
+      },
+    });
+  }
+};

package/starter/src/resources/users/handlers/test.js

@@ -0,0 +1 @@
+console.log('hello from handler');

package/starter/src/routes/index.js

@@ -96,6 +96,7 @@ export default async (app) => {
 
     endpoints.forEach(({ endpoint, requestSchema, middlewares = [], handler }) => {
       let targetRouter;
+      console.log('[routes] Register endpoint', resourceName, endpoint?.method || 'GET', endpoint?.url);
 
       let url = endpoint.absoluteUrl || endpoint.url;