@leonid-shutov/uncommonjs 1.0.0-alpha.3 → 1.0.0-alpha.5

package/lib/loader.js

@@ -26,7 +26,7 @@ const loadFile = async (context, container, filePath, key) => {
 };
 
 const loadDir = async (context, container, dirPath, key) => {
-  key ??= dirPath.split('/').at(-1);
+  key ??= removeIndex(dirPath.split('/').at(-1));
   const nextContainer = container[key] ?? {};
   container[key] = nextContainer;
   const files = [];

package/lib/rest.js

@@ -42,6 +42,13 @@ const bodyFromDefinition = (response, definition) => {
   return definition.response ?? null;
 };
 
+const statusFromDefinition = (response, definition) => {
+  if (typeof definition.status === 'function') {
+    return definition.status(response);
+  }
+  return definition.status ?? 200;
+};
+
 const createHandler = (definition) => {
   const schema = { query: definition.query, body: definition.body };
   return async ({ path, query, body, ...rest }) => {
@@ -49,7 +56,7 @@ const createHandler = (definition) => {
       validateRequest(schema, { query, body });
       const response = await definition.handler({ path, query, body, ...rest });
       return {
-        status: definition.status ?? 200,
+        status: statusFromDefinition(response, definition),
         body: bodyFromDefinition(response, definition),
       };
     } catch (error) {

package/lib/service.js

@@ -4,15 +4,15 @@ const isService = (definition, context) =>
   definition?.method !== undefined && context.PASS !== undefined;
 
 const loadService = (definition, context) => {
-  const { description, method, expectedErrors } = definition;
+  const { description, method } = definition;
   const logger = context.logger ?? context.console ?? { info: () => {} };
-  return async (...args) => {
+  return (...args) => {
     const interpolatedDesc =
       typeof description === 'function' ? description(...args) : description;
-    try {
-      logger.info(interpolatedDesc);
-      return await method(...args);
-    } catch (error) {
+    logger.info(interpolatedDesc);
+
+    const handleError = (error) => {
+      const { description, expectedErrors } = definition;
       let domainError = expectedErrors?.[error.code];
       if (domainError === context.PASS) throw error;
       if (domainError === undefined) {
@@ -23,7 +23,21 @@ const loadService = (definition, context) => {
       }
       domainError.cause = error;
       throw domainError;
+    };
+
+    let result;
+
+    try {
+      result = method(...args);
+    } catch (error) {
+      handleError(error);
     }
+
+    if (typeof result?.then === 'function') {
+      return result.catch((error) => handleError(error));
+    }
+
+    return result;
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leonid-shutov/uncommonjs",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.5",
   "author": "Leonid Shutov <leonid.shutov.main@gmail.com>",
   "license": "MIT",
   "homepage": "https://github.com/leonid-shutov/uncommonjs#readme",