@ololoepepe/controllers 0.2.33 → 0.2.35

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@ololoepepe/controllers",
-  "version": "0.2.33",
+  "version": "0.2.35",
   "description": "Common Express controllers library",
-  "main": "index.js",
+  "main": "src/index.js",
+  "imports": {
+    "#src/*.js": "./src/*.js"
+  },
+  "type": "module",
   "scripts": {
     "lint": "eslint ./src",
     "test": "mocha ./test/*"
@@ -10,6 +14,11 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.com"
   },
+  "files": [
+    "src",
+    "package.json",
+    "README.md"
+  ],
   "repository": {
     "type": "git",
     "url": "git+ssh://git@ssh.gitlab.void-walkers.com:1022/libs/node.js/controllers.git"
@@ -21,12 +30,12 @@
   },
   "homepage": "https://gitlab.void-walkers.com/libs/node.js/controllers#README",
   "devDependencies": {
-    "body-parser": "^1.20.1",
-    "chai": "^4.3.7",
-    "chai-http": "^4.3.0",
-    "eslint": "^8.34.0",
-    "eslint-config-xo": "^0.43.1",
-    "express": "^4.18.2",
-    "mocha": "^10.2.0"
+    "@ololoepepe/eslint-config": "^0.0.17",
+    "body-parser": "^1.20.2",
+    "chai": "^4.4.1",
+    "chai-http": "^4.4.0",
+    "eslint": "^8.57.0",
+    "express": "^4.18.3",
+    "mocha": "^10.3.0"
   }
 }

package/src/controllers/index.js

@@ -1,9 +1,5 @@
-const jsonController = require('./json-controller');
-const noContentController = require('./no-content-controller');
-const stringController = require('./string-controller');
+import jsonController from './json-controller.js';
+import noContentController from './no-content-controller.js';
+import stringController from './string-controller.js';
 
-module.exports = {
-  jsonController,
-  noContentController,
-  stringController
-};
+export {jsonController, noContentController, stringController};

package/src/controllers/json-controller.js

@@ -1,4 +1,4 @@
-const {selectStatusCode} = require('../lib/helper');
+import {selectStatusCode} from '#src/lib/helper.js';
 
 /**
  * Создает функцию-контроллер, вызывающую переданный callback при запросах
@@ -19,18 +19,14 @@ const {selectStatusCode} = require('../lib/helper');
  * @return {function} - функция-контроллер
  */
 
-function jsonController(callback, statusCode) {
-  return async (req, res, next) => {
-    try {
-      const result = await callback(req, res);
+export default (callback, statusCode) => async (req, res, next) => {
+  try {
+    const result = await callback(req, res);
 
-      const json = (result === undefined) ? {} : result;
+    const json = (result === undefined) ? {} : result;
 
-      res.status(statusCode || selectStatusCode(req.method)).json(json);
-    } catch (err) {
-      next(err);
-    }
-  };
-}
-
-module.exports = jsonController;
+    res.status(statusCode || selectStatusCode(req.method)).json(json);
+  } catch (err) {
+    next(err);
+  }
+};

package/src/controllers/no-content-controller.js

@@ -1,3 +1,5 @@
+import {selectStatusCode} from '#src/lib/helper.js';
+
 /**
  * Создает функцию-контроллер, вызывающую переданный callback при запросах
  * и устанавливающую код ответа после ее выполнения. Тело ответа оставляется пустым.
@@ -13,16 +15,12 @@
  * @return {function} - функция-контроллер
  */
 
-function noContentController(callback, statusCode = 204) {
-  return async (req, res, next) => {
-    try {
-      await callback(req, res);
-
-      res.sendStatus(statusCode);
-    } catch (err) {
-      next(err);
-    }
-  };
-}
+export default (callback, statusCode = 204) => async (req, res, next) => {
+  try {
+    await callback(req, res);
 
-module.exports = noContentController;
+    res.sendStatus(statusCode || selectStatusCode(req.method));
+  } catch (err) {
+    next(err);
+  }
+};

package/src/controllers/string-controller.js

@@ -1,4 +1,4 @@
-const {selectStatusCode} = require('../lib/helper');
+import {selectStatusCode} from '#src/lib/helper.js';
 
 /**
  * Создает функцию-контроллер, вызывающую переданный callback при запросах
@@ -19,18 +19,14 @@ const {selectStatusCode} = require('../lib/helper');
  * @return {function} - функция-контроллер
  */
 
-function stringController(callback, statusCode) {
-  return async (req, res, next) => {
-    try {
-      const result = await callback(req, res);
+export default (callback, statusCode) => async (req, res, next) => {
+  try {
+    const result = await callback(req, res);
 
-      const string = (result === undefined) ? '' : result;
+    const string = (result === undefined) ? '' : result;
 
-      res.status(statusCode || selectStatusCode(req.method)).send(string);
-    } catch (err) {
-      next(err);
-    }
-  };
-}
-
-module.exports = stringController;
+    res.status(statusCode || selectStatusCode(req.method)).send(string);
+  } catch (err) {
+    next(err);
+  }
+};

package/src/index.js

@@ -0,0 +1 @@
+export {jsonController, noContentController, stringController} from './controllers/index.js';

package/src/lib/helper.js

@@ -9,7 +9,7 @@
  * @return {number} - HTTP-код ответа
  */
 
-function selectStatusCode(method) {
+export function selectStatusCode(method) {
   if (typeof method === 'string') {
     method = method.toUpperCase();
   }
@@ -24,7 +24,3 @@ function selectStatusCode(method) {
     return 200;
   }
 }
-
-module.exports = {
-  selectStatusCode
-};

package/index.js

@@ -1 +0,0 @@
-module.exports = require('./src/controllers');