vaderjs 1.3.3-alpha-90 → 1.3.3-alpha-92

package/package.json

@@ -2,7 +2,7 @@
   "name": "vaderjs",
   "description": "A Reactive library aimed to helping you build reactive applications inspired by react.js",
   "module": "vader.js",
-  "version": "1.3.3-alpha-90",
+  "version": "1.3.3-alpha-92",
   "bin": {
     "vader": "./vader.js"
   },

package/vader.js

@@ -559,7 +559,9 @@ function Compiler(func, file) {
     if (line.includes('import')) {
       // Regular expression for matching import() statements
       let asyncimportMatch = line.match(/import\s*\((.*)\)/gs);
-      let regularimportMatch = line.match(/import\s+([\w\s{},]*)\s*from\s*(['"][^'"]+['"])(?![^<]*>)/gs);
+      // handle named imports and unnamed import 'path'
+      let regularimportMatch = line.match(/import\s*([a-zA-Z0-9_-]+)?\s*from\s*('(.*)'|"(.*)")|import\s*('(.*)'|"(.*)")/gs);
+    
 
       if (asyncimportMatch) {
         asyncimportMatch.forEach(async (match) => {
@@ -574,6 +576,9 @@ function Compiler(func, file) {
 
               break;
             case path && path.includes('module.css'):
+              
+               
+
               let css = await fs.readFileSync(process.cwd() + path, 'utf8')
               css = css.replaceAll('.', '')
            
@@ -609,11 +614,22 @@ function Compiler(func, file) {
 
       if (regularimportMatch) {
         for (let match of regularimportMatch) {
-          let beforeimport = match
-          let path = match.split('from')[1].trim() || match.split('import')[1] 
+          let beforeimport = match 
+          // import {name} from 'path' or import 'path'
+          let path = match.split('from')[1] ? match.split('from')[1].trim() : match.split('import')[1].trim()
           let newImport = ''
           let name = match.split('import')[1].split('from')[0].trim()
- 
+  
+          path = path.replace(/'/g, '').trim().replace(/"/g, '').trim()
+          let deep = path.split('/').length - 1
+          for (let i = 0; i < deep; i++) {
+            path = path.split('../').join('')
+            path = path.split('./').join('')
+          }
+          path = path.replace(/'/g, '').trim().replace(/"/g, '').trim()
+          // remove double / from path
+          path = path.split('//').join('/')
+
           switch (true) {
             case path && path.includes('json'):
               path = path.replace(';', '')
@@ -624,8 +640,7 @@ function Compiler(func, file) {
             
             path = path.replace(';', '')
             path = path.replace(/'/g, '').trim().replace(/"/g, '').trim()
-            path = path.replaceAll('.jsx', '.js');
-            path = path.replaceAll('../', '');
+            path = path.replaceAll('.jsx', '.js'); 
             
             let css = fs.readFileSync(process.cwd() + '/' + path, 'utf8')
  
@@ -633,8 +648,7 @@ function Compiler(func, file) {
             newImport = `let ${name} = ${JSON.stringify(parse(css))}`
             string = string.replace(beforeimport, newImport)
               break;
-            case path && path.endsWith('.css'): 
-               console.log(path)
+            case path && path.endsWith('.css'):  
               string = string.replace(beforeimport, '')
               newImport = ``
               break;
@@ -657,7 +671,7 @@ function Compiler(func, file) {
               path = path.replaceAll('.jsx', '.js');
   
   
-              string = string.replace(beforePath, "'" + path + "'")
+              string = string.replace(beforePath, path)
               break;
               
           }