binhend 2.2.10 → 2.2.12

package/index.js

@@ -10,7 +10,7 @@ const path = require('path');
 
 //___ Run scripts ___//
 const moduleAlias = require('./packages/module-alias'); // path alias '@' for requiring modules: require('@/any/path') - use jsconfig.json
-moduleAlias.paths['@binhend/*'] = [ path.join(__dirname, './packages') ]; // set path alias '@binhend' for all packages to call each others when 'npm install' in another project
+moduleAlias.path('@binhend/*', [ path.join(__dirname, './packages') ]); // set path alias '@binhend' for all packages to call each others when 'npm install' in another project
 
 const server = require('./packages/core/src/server');
 const Router = require('./packages/core/src/Router');

package/package.json

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

package/packages/core/index.js

@@ -1,33 +1,6 @@
 
-const utils = require('@binhend/utils');
-const middlewares = require('@binhend/middlewares');
-const { config, ConfigLoader } = require('@binhend/config');
-const { WebBuild, binh } = require('@binhend/web');
-
-// Run scripts
-require('@binhend/module-alias'); // for format: require('@/any/path')
-
 module.exports = {
     server: require('./src/server'),
     Router: require('./src/Router'),
-    routes: require('./src/routes').routes,
-
-    cors: middlewares.cors,
-    trycatch: middlewares.trycatch,
-
-    config, ConfigLoader,
-
-    HTTPS: require('@binhend/https').HTTPS,
-    HttpError: utils.HttpError,
-    HttpCodes: utils.HttpCodes,
-    Bromise: utils.Bromise,
-
-    CSD: require('@binhend/csd'),
-
-    crypto: require('@binhend/crypto'),
-
-    types: require('@binhend/types'),
-    validation: require('@binhend/validation'),
-
-    WebBuild, binh
+    routes: require('./src/routes').routes
 };

package/packages/module-alias/src/alias-cjs-loader.js

@@ -24,19 +24,24 @@ const paths = jsconfig?.compilerOptions?.paths || {};
 const settings = { // for external modification in run-time
     paths,
     webSourcePath: null,
-    webModulePath: null
+    webModulePath: null,
+    path: mapAliasWithFilePaths
 };
 
 /** Step 2: Create an alias map with all possible paths */
-const aliasMap = {};
+const aliasMap = {}, ENDING_WILDCARD = /\/\*$/;
 
 for (const alias in paths) {
-    const aliasPath = alias.replace('/*', ''); // Strip the '/*' for matching // TODO write regex for ending with /*
-    const originalPaths = paths[alias]; // Get the array of paths
+    const filePaths = paths[alias]; // Get the array of file paths
+    mapAliasWithFilePaths(alias, filePaths);
+}
+
+function mapAliasWithFilePaths(alias, filePaths) {
+    const aliasPath = alias.replace(ENDING_WILDCARD, ''); // Strip the '/*' for matching
 
-    aliasMap[aliasPath] = originalPaths.map((originalPath) => {
+    aliasMap[aliasPath] = filePaths.map((filePath) => {
         // Resolve each path to an absolute path
-        return path.resolve(baseUrl, originalPath.replace('/*', ''));
+        return path.resolve(baseUrl, filePath.replace(ENDING_WILDCARD, ''));
     });
 }
 
@@ -48,18 +53,21 @@ Module._resolveFilename = function (request, parent, isMain, options) {
         if (!request.startsWith(alias)) continue;
         // Loop through the array of resolved paths for this alias
         for (const resolvedPath of aliasMap[alias]) {
-            // Construct the new request path
+            // Construct a new request path (convert @ path to resolved path)
             var newRequest = request.replace(alias, resolvedPath);
 
-            // BINHEND web components load each others still requiring src paths (src file paths), not module paths (formatted file paths)
+            // Check if the above resolved path matching web component path, then change from source directory to module directory
             if (parent.filename.startsWith(settings.webModulePath)) {
+                // BINHEND web components (formatted code) load each others in build-time still requiring src paths (src file paths), not module paths (formatted file paths)
+                // parent.filename is the file location of module which makes this request by calling require()
                 newRequest = newRequest.replace(settings.webSourcePath, settings.webModulePath);
             }
 
             // Attempt to resolve the new request
             try {
                 return originalResolveFilename.call(this, newRequest, parent, isMain, options);
-            } catch (err) {
+            }
+            catch (err) {
                 // If it fails, continue to the next path
                 continue;
             }