@azteam/express 1.2.337 → 1.2.339

package/lib/controller/AdminController.js

@@ -38,11 +38,11 @@ var ALLOW_FIELDS = ['created_at', 'created_id', 'modified_at', 'modified_id', 'd
 var AdminController = /*#__PURE__*/function (_Controller) {
   _inherits(AdminController, _Controller);
   var _super = _createSuper(AdminController);
-  function AdminController(pathName, repository) {
+  function AdminController(repository) {
     var _this;
-    var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     _classCallCheck(this, AdminController);
-    _this = _super.call(this, pathName, repository);
+    _this = _super.call(this, repository);
     _defineProperty(_assertThisInitialized(_this), "methodGetPaginate", /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res) {
         var paginateData;

package/lib/controller/Controller.js

@@ -4,15 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _lodash = _interopRequireDefault(require("lodash"));
+var _pluralize = _interopRequireDefault(require("pluralize"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 var Controller = /*#__PURE__*/function () {
   function Controller() {
-    var pathName = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-    var repository = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    var repository = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
     _classCallCheck(this, Controller);
-    this.pathName = pathName;
+    this.name = this.constructor.name.replace('Controller', '');
+    this.pathName = (0, _pluralize["default"])(_lodash["default"].snakeCase(this.name));
     this.repository = repository;
   }
   _createClass(Controller, [{

package/lib/controller/SitemapController.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
 var _util = _interopRequireDefault(require("util"));
 var _Controller2 = _interopRequireDefault(require("./Controller"));
@@ -22,18 +23,21 @@ function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) ===
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-var TEMPLATE_DIR = _path["default"].resolve('../template/sitemap');
+var TEMPLATE_DIR = _path["default"].resolve(__dirname, '../template/sitemap');
 var SitemapController = /*#__PURE__*/function (_Controller) {
   _inherits(SitemapController, _Controller);
   var _super = _createSuper(SitemapController);
-  function SitemapController() {
+  function SitemapController(repository) {
+    var _this;
     _classCallCheck(this, SitemapController);
-    return _super.apply(this, arguments);
+    _this = _super.call(this, repository);
+    _this.sitemapName = _lodash["default"].camelCase(_this.name);
+    return _this;
   }
   _createClass(SitemapController, [{
     key: "postGetSitemap",
     value: function postGetSitemap() {
-      var _this = this;
+      var _this2 = this;
       return {
         path: '/sitemap',
         method: [/*#__PURE__*/function () {
@@ -49,7 +53,7 @@ var SitemapController = /*#__PURE__*/function (_Controller) {
                       break;
                     }
                     _context.next = 4;
-                    return _this.repository.find({
+                    return _this2.repository.find({
                       domains: req.rootOrigin,
                       metadata_disable: 0
                     }, {
@@ -61,10 +65,13 @@ var SitemapController = /*#__PURE__*/function (_Controller) {
                     paginateData = _context.sent;
                     _templatePath = _path["default"].resolve("".concat(TEMPLATE_DIR, "/list.ejs"));
                     data = paginateData.docs.map(function (item) {
-                      return {
-                        path: _util["default"].format(pattern, item.slug),
-                        modified_at: item.modified_at
-                      };
+                      if (item.slug !== 'home') {
+                        return {
+                          path: _util["default"].format(pattern, item.slug),
+                          modified_at: item.modified_at
+                        };
+                      }
+                      return null;
                     });
                     return _context.abrupt("return", res.xml(_templatePath, {
                       priority: 0.8,
@@ -73,7 +80,7 @@ var SitemapController = /*#__PURE__*/function (_Controller) {
                     }));
                   case 8:
                     _context.next = 10;
-                    return _this.repository.count({
+                    return _this2.repository.count({
                       domains: req.rootOrigin,
                       metadata_disable: 0
                     });
@@ -82,7 +89,7 @@ var SitemapController = /*#__PURE__*/function (_Controller) {
                     templatePath = _path["default"].resolve("".concat(TEMPLATE_DIR, "/count.ejs"));
                     return _context.abrupt("return", res.xml(templatePath, {
                       total: total / 1000,
-                      name: _this.name,
+                      name: _this2.sitemapName,
                       domain: req.get('Origin')
                     }));
                   case 13:

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.337",
+    "version": "1.2.339",
     "license": "MIT",
     "author": "toda <sp.azsolution.net@gmail.com>",
     "main": "./lib/index.js",
@@ -21,7 +21,7 @@
         "body-parser": "1.19.0",
         "cookie-parser": "1.4.4",
         "cors": "2.8.4",
-        "eiows": "3.4.1",
+        "eiows": "4.1.2",
         "ejs": "3.1.6",
         "etag": "1.8.1",
         "express": "4.17.1",

package/src/controller/AdminController.js

@@ -22,8 +22,8 @@ const ALLOW_FIELDS = [
 ];
 
 class AdminController extends Controller {
-    constructor(pathName, repository, options = {}) {
-        super(pathName, repository);
+    constructor(repository, options = {}) {
+        super(repository);
 
         this.roles = {
             EXEC: null,

package/src/controller/Controller.js

@@ -1,6 +1,11 @@
+import _ from 'lodash';
+import pluralize from 'pluralize';
+
 class Controller {
-    constructor(pathName = '', repository = null) {
-        this.pathName = pathName;
+    constructor(repository = null) {
+        this.name = this.constructor.name.replace('Controller', '');
+
+        this.pathName = pluralize(_.snakeCase(this.name));
         this.repository = repository;
     }
 

package/src/controller/SitemapController.js

@@ -1,11 +1,17 @@
+import _ from 'lodash';
 import path from 'path';
 import util from 'util';
 
 import Controller from './Controller';
 
-const TEMPLATE_DIR = path.resolve('../template/sitemap');
+const TEMPLATE_DIR = path.resolve(__dirname, '../template/sitemap');
 
 class SitemapController extends Controller {
+    constructor(repository) {
+        super(repository);
+        this.sitemapName = _.camelCase(this.name);
+    }
+
     postGetSitemap() {
         return {
             path: '/sitemap',
@@ -26,10 +32,13 @@ class SitemapController extends Controller {
                             ),
                             templatePath = path.resolve(`${TEMPLATE_DIR}/list.ejs`),
                             data = paginateData.docs.map((item) => {
-                                return {
-                                    path: util.format(pattern, item.slug),
-                                    modified_at: item.modified_at,
-                                };
+                                if (item.slug !== 'home') {
+                                    return {
+                                        path: util.format(pattern, item.slug),
+                                        modified_at: item.modified_at,
+                                    };
+                                }
+                                return null;
                             });
 
                         return res.xml(templatePath, {
@@ -46,7 +55,7 @@ class SitemapController extends Controller {
 
                     return res.xml(templatePath, {
                         total: total / 1000,
-                        name: this.name,
+                        name: this.sitemapName,
                         domain: req.get('Origin'),
                     });
                 },