@makano/rew 1.1.22 → 1.1.25

package/lib/rew/cli/cli.js

@@ -6,8 +6,9 @@ const { hideBin } = require('yargs/helpers');
 const { fork, exec } = require('child_process');
 const { watch } = require('chokidar');
 const utils = require('./utils');
-const { existsSync } = require('fs');
+const { existsSync, readFileSync, writeFileSync, mkdirSync } = require('fs');
 const { log } = require('./log');
+const { compileFile, compile } = require('../modules/compiler');
 
 yargs(hideBin(process.argv))
   .command(
@@ -125,9 +126,69 @@ yargs(hideBin(process.argv))
       .positional('file', {
         describe: 'File to build',
         type: 'string',
+      })
+      .option('output', {
+        alias: 'o',
+        describe: 'Output directory',
+        type: 'string',
       });
   }, (argv) => {
-    console.log(`Building file: ${argv.file}`);
+
+    function readFile(filePath) {
+      return readFileSync(filePath, { encoding: 'utf-8' });
+    }
+
+    function extractImports(content) {
+      const importRegex = /(\w+)\s*=\s*imp\s*['"](.+?)['"]/g;
+      const imports = [];
+      let match;
+      while ((match = importRegex.exec(content)) !== null) {
+        imports.push({ variable: match[1], url: match[2] });
+      }
+      return imports;
+    }
+
+    function writeCompiledFile(filePath, compiledCode) {
+      const dirName = outputDir ? outputDir : path.dirname(filePath);
+      if(!existsSync(dirName)) mkdirSync(dirName, { recursive: true });
+      const baseName = path.basename(filePath, path.extname(filePath));
+      const newFilePath = path.join(dirName, `${baseName}.js`);
+      writeFileSync(newFilePath, compiledCode, { encoding: 'utf-8' });
+      log(`Compiled: ${newFilePath}`);
+    }
+
+    function processFile(filePath, importsArray) {
+      const content = readFile(filePath);
+      const imports = extractImports(content);
+  
+      imports.forEach(importStatement => {
+        const importedFilePath = path.resolve(path.dirname(filePath), importStatement.url);
+        if (!importsArray.some(importObj => importObj.url === importStatement.url)) {
+          
+          if(existsSync(importedFilePath)){
+            importsArray.push(importStatement);
+            processFile(importedFilePath, importsArray);
+          } else if(existsSync(importedFilePath+'.coffee')){
+            importsArray.push(importStatement);
+            processFile(importedFilePath+'.coffee', importsArray);
+          } else if(existsSync(importedFilePath+'.js')){
+            importsArray.push(importStatement);
+            processFile(importedFilePath+'.js', importsArray);
+          }
+
+        }
+      });
+
+      const compiled = compile({ content }, {});
+      writeCompiledFile(filePath, compiled);
+    }
+
+    const filePath = path.resolve(process.cwd(), argv.file);
+    const importsArray = [];
+    const outputDir = argv.output ? path.resolve(process.cwd(), argv.output) : null;
+    log('Start compile at', outputDir || 'default path');
+    processFile(filePath, importsArray);
+    log('Compiled', importsArray.length + 1, 'files.', ':end');
   })
   .help()
   .argv;

package/lib/rew/pkgs/ui.js

@@ -26,7 +26,7 @@ const defaultOptions = {
   onExit: () => process.exit(),
   style: '',
   stylePath: THEME_PATH,
-  exec: () => {},
+  exec: () => { },
   execContext: {}
 };
 
@@ -44,18 +44,22 @@ module.exports = (context) => ({
 
     options.runId = runId;
 
-    if(fs.existsSync(options.stylePath)) options.style = fs.readFileSync(options.stylePath, { encoding: 'utf-8' }) + '\n' + options.style;
+    if (fs.existsSync(options.stylePath)) options.style = fs.readFileSync(options.stylePath, { encoding: 'utf-8' }) + '\n' + options.style;
 
-    options.style = ' */\n'+options.style+'\n/* ';
+    options.style = ' */\n' + options.style + '\n/* ';
 
     const HTML = replaceString(HTML_STRING, options);
     const JS = replaceString(JS_STRING, options);
 
+    /**
+     * Queue for future writes
+     * @type {string[]}
+     * */
     const queue = [];
 
     const send = (data) => {
       const content = fs.readFileSync(tmpFile, { encoding: 'utf-8' });
-      if(content) {
+      if (content) {
         queue.push(data);
       } else {
         fs.writeFileSync(tmpFile, typeof data !== "string" ? JSON.stringify(data) : data);
@@ -77,20 +81,20 @@ module.exports = (context) => ({
       output: process.stdout
     });
 
-    rl.question('', () => {});
+    rl.question('', () => { });
 
     fs.writeFileSync(tmpFile, '');
 
     fs.watch(tmpFile, { encoding: 'utf-8' })
-    .on('change', () => {
-      if(queue.length){
-        send(queue.pop());
-      }
-    });
+      .on('change', () => {
+        if (queue.length) {
+          send(queue.pop());
+        }
+      });
 
     const p = spawn(BIN_PATH, [runId]);
 
-    
+
 
     p.on("close", (code) => {
       rl.close();
@@ -103,12 +107,12 @@ module.exports = (context) => ({
     });
 
     g_emitter.on('recieve', (edata) => {
-      if(edata.action.startsWith('hook:')){
+      if (edata.action.startsWith('hook:')) {
         const hook = hookedSocketListeners[edata.data.rid];
         const type = edata.action.split('hook:')[1];
-        if(hook && hook.type == type) {
+        if (hook && hook.type == type) {
           hookedSocketListeners[edata.data.rid].cb(edata.data.object);
-          if(hook.once) delete hookedSocketListeners[edata.data.rid];
+          if (hook.once) delete hookedSocketListeners[edata.data.rid];
         }
       }
     });
@@ -119,7 +123,7 @@ module.exports = (context) => ({
           const d = data.toString().split("RESPONSE::")[1];
           const jd = JSON.parse(d);
           recieve(jd);
-        } else if(data.toString().trim().endsWith('SETUP::READY')) {
+        } else if (data.toString().trim().endsWith('SETUP::READY')) {
           console.log('READY');
           r(uiClasses(context, options, sendEvent, (cb) => {
             g_emitter.on('recieve', cb);
@@ -128,15 +132,15 @@ module.exports = (context) => ({
           }, (rid) => { // Remove hook
             delete hookedSocketListeners[rid];
           }));
-        } else if(data.toString().endsWith('SETUP::HTML')) {
-          send({action: 'JS2', data: JS, isSetup: true});
-        } else if(data.toString() == 'INIT::READY') {
-          send({action: 'HTML', data: HTML});
+        } else if (data.toString().endsWith('SETUP::HTML')) {
+          send({ action: 'JS2', data: JS, isSetup: true });
+        } else if (data.toString() == 'INIT::READY') {
+          send({ action: 'HTML', data: HTML });
         } else {
           console.log(data.toString());
         }
       });
-  
+
       p.stderr.on("data", (data) => {
         console.error(data.toString());
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.1.22",
+  "version": "1.1.25",
   "description": "A simple coffescript runtime",
   "main": "lib/rew/main.js",
   "directories": {