binhend 2.2.4 → 2.2.6

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Nguyễn Đức Bình
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/index.js

@@ -6,56 +6,48 @@
 
 'use strict';
 
-const { server, routes, Router } = require('./packages/core');
+const server = require('./packages/core/src/server');
+const Router = require('./packages/core/src/Router');
+const { routes } = require('./packages/core/src/routes');
 
-const { Bromise, HttpCodes, HttpError } = require('./packages/utils');
+const Bromise = require('./packages/utils/src/Bromise');
+const HttpError = require('./packages/utils/src/HttpError');
+const HttpCodes = require('./packages/utils/src/HttpCodes');
 
-const { cors, trycatch } = require('./packages/middlewares');
+const { HTTPS } = require('./packages/https/src/https');
 
-const { HTTPS } = require('./packages/https');
+const cors = require('./packages/middlewares/src/cors');
+const trycatch = require('./packages/middlewares/src/trycatch');
 
 const { config, ConfigLoader } = require('./packages/config/src/configuration');
 
-const { WebBuild, binh } = require('./packages/web');
-
-// const { create: CSD, Controller: CinCSD, Service: SinCSD, DAO: DinCSD } = require('./packages/csd/src/');
-
 const CSD = require('./packages/csd/src/csd');
 const CinCSD = require('./packages/csd/src/controller');
 const SinCSD = require('./packages/csd/src/service');
 const DinCSD = require('./packages/csd/src/dao');
 
-const { crypto } = require('./packages/crypto');
+const crypto = require('./packages/crypto/src/crypto');
+const types = require('./packages/types/src/typeCheck');
+const validation = require('./packages/validation/src/typeValidation');
 
-const types = require('./packages/types');
+const { WebBuild } = require('./packages/web/src/WebBuild');
+const { binh } = require('./packages/web/src/component.method');
 
-const validation = require('./packages/validation');
-
-// Run scripts
-require('./packages/module-alias'); // for format: require('@/any/path')
+//___ Run scripts ___//
+require('./packages/module-alias'); //--- alias path '@' for requiring modules: require('@/any/path')
 
 module.exports = {
     server, routes, Router,
 
-    Bromise, HttpCodes, HttpError,
+    Bromise, HttpError, HttpCodes, HTTPS,
 
     cors, trycatch,
 
     config, ConfigLoader,
 
-    HTTPS,
-
     CSD, CinCSD, SinCSD, DinCSD, // only CSD is for usage, others for exposing methods (via IDE auto-suggestion)
 
-    crypto,
-
-    types,
-    validation,
+    crypto, types, validation,
 
     WebBuild, binh
 };
-
-
-// module.exports = {
-//     ...require('@binhend/core'),
-// };

package/jsconfig.json

@@ -7,13 +7,16 @@
         "allowJs": true,
         "noEmit": true,
 
-        "baseUrl": "./src",
+        "baseUrl": "./",
         "paths": {
             "@/*": [
-                "./*"
+                "./src/*"
+            ],
+            "@binhend/*": [
+                "./packages/*"
             ],
             "@test/*": [
-                "../test/*"
+                "./test/*"
             ]
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "binhend",
-    "version": "2.2.4",
+    "version": "2.2.6",
     "description": "",
     "main": "index.js",
     "author": "Nguyen Duc Binh",

package/packages/core/src/server.js

@@ -1,9 +1,19 @@
+
 const express = require('express');
 
-var server;
+var server = express();
+var calledOnce = false;
 
 function getServer() {
-    return server || (server = express());
+    if (calledOnce) {
+        server = server;
+    }
+    else {
+        server = express();
+        calledOnce = true;
+    }
+
+    return server;
 }
 
 module.exports = getServer;

package/packages/csd/package.json

@@ -9,6 +9,7 @@
     "dependencies": {
         "@binhend/types": "^1.0.0",
         "@binhend/utils": "^1.0.0",
+        "@binhend/validation": "^1.0.0",
         "@binhend/middlewares": "^1.0.1"
     }
 }

package/packages/csd/src/controller.js

@@ -28,7 +28,7 @@ function Controller(service) {
         response.status(httpCode).json(result);
     }
 
-    /** CREATE */
+    //___ CREATE ___//
 
     this.create = trycatch(async (request, response) => {
         let data = request.body;
@@ -40,7 +40,7 @@ function Controller(service) {
         await process('upsert', [query, data], OK, response);
     });
 
-    /** READ */
+    //___ READ ___//
 
     this.getAll = trycatch(async (request, response) => {
         await process('getAll', [], OK, response);
@@ -56,7 +56,7 @@ function Controller(service) {
         await process('getByQuery', [query], OK, response);
     });
 
-    /** UPDATE */
+    //___ UPDATE ___//
 
     this.updateAll = trycatch(async (request, response) => {
         let data = request.body;
@@ -74,7 +74,7 @@ function Controller(service) {
         await process('updateByQuery', [query, data], OK, response);
     });
 
-    /** DELETE */
+    //___ DELETE ___//
 
     this.deleteAll = trycatch(async (request, response) => {
         await process('deleteAll', [], OK, response);

package/packages/csd/src/dao.js

@@ -1,17 +1,31 @@
 
-const initService = require('./service');
+const must = require('@binhend/validation');
 
-function DAO(instance) {
-    var service = initService({});
+function DAO(implementedInstance = {}) {
 
-    for (var key in service) {
-        if (!instance.hasOwnProperty(key) || typeof instance[key] !== 'function') {
-            throw new Error(`CSD: Missing function implementation for "${key}()"`);
-        }
-        this[key] = instance[key];
-    }
+    const instance = implementedInstance,
+        required = { required: true };
+
+    //___ CREATE ___//
+    this.create = must.Function(instance.create, required);
+    this.upsert = must.Function(instance.upsert, required);
+
+    //___ READ ___//
+    this.getAll = must.Function(instance.getAll, required);
+    this.getByID = must.Function(instance.getByID, required);
+    this.getByQuery = must.Function(instance.getByQuery, required);
+
+    //___ UPDATE ___//
+    this.updateAll = must.Function(instance.updateAll, required);
+    this.updateByID = must.Function(instance.updateByID, required);
+    this.updateByQuery = must.Function(instance.updateByQuery, required);
+
+    //___ DELETE ___//
+    this.deleteAll = must.Function(instance.deleteAll, required);
+    this.deleteByID = must.Function(instance.deleteByID, required);
+    this.deleteByQuery = must.Function(instance.deleteByQuery, required);
 }
 
-module.exports = (instance) => {
-    return new DAO(instance);
+module.exports = (implementedInstance) => {
+    return new DAO(implementedInstance);
 };

package/packages/web/src/component.method.js

@@ -3,7 +3,6 @@ const path = require('path');
 const fs = require('fs');
 const UglifyCSS = require('uglifycss');
 const Component = require('./component');
-// @ts-ignore
 const { isString } = require('@binhend/types');
 
 const binh = {};