binhend 2.1.31 → 2.1.33

package/package.json

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

package/src/web/component.build.js

@@ -1,6 +1,7 @@
 // @ts-nocheck
 
 const path = require('path');
+const { parseFileName, isAcceptedJS, isExceptedJS } = require('./file-check');
 const { scanNestedFiles, cloneFileIfNew, writeToFileIfNew, makeFullDirPath } = require('./component.file');
 const CodeFormat = require('./code');
 const Component = require('./component');
@@ -24,7 +25,9 @@ function processEachFile({ source: sourceRootPath, web: outputRootPath, module:
 
         makeFullDirPath(fileOutputPath);
 
-        if (path.parse(file.name).ext !== '.js') {
+        var filename = parseFileName(file.name);
+
+        if (!isAcceptedJS(filename) || isExceptedJS(filename)) {
             return cloneFileIfNew(fileSourcePath, fileOutputPath);
         }
 
@@ -32,7 +35,7 @@ function processEachFile({ source: sourceRootPath, web: outputRootPath, module:
             var component = require(file.path);
         }
         catch (error) {
-            if (path.parse(file.name).ext === '.js') console.error('[BINHEND][WEB-BUILD]', error);
+            console.error('[BINHEND][WEB-BUILD]', error);
             return cloneFileIfNew(fileSourcePath, fileOutputPath);
         }
 

package/src/web/component.format.js

@@ -1,6 +1,6 @@
 const { config } = require('../configuration');
 const { readFileSync } = require('fs');
-const { parse } = require('path');
+const { parseFileName, isAcceptedJS, isExceptedJS } = require('./file-check');
 const { scanNestedFiles, cloneFileIfNew, printError, makeFullDirPath, writeToFileIfNew } = require('./component.file');
 
 const PREFIX_CODE =
@@ -23,25 +23,25 @@ function generate(sourceRootPath, outputRootPath, callbackDone) {
         try {
             makeFullDirPath(fileOutputPath);
 
-            var fileExtension = parse(file.name).ext;
-    
-            if (fileExtension === '.css') {
+            var filename = parseFileName(file.name);
+
+            if (filename.ext === '.css') {
                 var cssModuleCode = 'binh.css(module);';
                 writeToFileIfNew(fileOutputPath + '.js', cssModuleCode);
                 // not return here, but wait for next "if" statement to be copied to build folder, then return there.
             }
 
-            if (fileExtension !== '.js' && fileExtension !== '.cjs' && fileExtension !== '.mjs') {
+            if (!isAcceptedJS(filename)) {
                 // any files not JS (.css, .jpg, etc.) will be copied to build folder.
                 cloneFileIfNew(fileSourcePath, fileOutputPath);
                 return;
             }
 
             var fileContent = readFileSync(fileSourcePath, { encoding: 'utf8', flag: 'r' });
-            var formatCode = mapConfigValues(fileContent.trim()); // for .cjs (common js) and .mjs (module js) files, not build code but still bind config values
+            var formatCode = mapConfigValues(fileContent.trim()); // for .c.js files, not build code but still bind config values
 
-            if (fileExtension === '.js') {
-                // for .js files, build code and bind config values
+            if (!isExceptedJS(file)) {
+                // except for .c.js files, build code and bind config values for other JS files (.js, .cjs, .mjs)
                 formatCode = PREFIX_CODE + formatCode + '\r\n\r\n;binh.final(module);';
             }
 

package/src/web/file-check.js

@@ -0,0 +1,35 @@
+
+
+const { parse } = require('path');
+
+function parseFileName(filename) {
+    const parsed = parse(filename);
+    const segments = parsed.base.split('.');
+
+    var ext2 = parsed.ext;
+
+    if (segments.length >= 3) {
+        // last two segments form the level 2 extension
+        ext2 = '.' + segments.slice(-2).join('.');
+    }
+
+    return {
+        ...parsed,
+        ext2,
+    };
+}
+
+function isAcceptedJS(parsedFileName) {
+    const fileExtension = parsedFileName.ext;
+    return fileExtension === '.js' || fileExtension === '.cjs' || fileExtension === '.mjs';
+}
+
+function isExceptedJS(parseFileName) {
+    return parseFileName.ext2 === '.c.js';
+}
+
+module.exports = {
+    parseFileName,
+    isAcceptedJS,
+    isExceptedJS
+};