@makano/rew 1.1.2 → 1.1.5

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/functions/exec.js

@@ -0,0 +1,27 @@
+const shell = require('child_process');
+
+
+module.exports = (currentFile) => {
+
+  function exec(command, options){
+    return shell.execSync(command, { stdio: options?.output == false ? null : 'inherit' });
+  }
+
+  exec.background = function execAsync(command, options, callback){
+    if(typeof options == "function" && !callback){
+      callback = options;
+      options = {};
+    }
+    if(!options) options = {};
+    if(!callback) callback = () => {};
+    return shell.exec(command, {
+      ...options,
+    }, callback);
+  }
+
+  function spawn(command, options){
+    return shell.spawn(command, options);
+  }
+
+  return { exec, spawn };
+}

package/lib/rew/functions/export.js

@@ -1,9 +1,27 @@
+
+function exportsThe(item, name, context){
+  if (name) {
+    if(!context.module.exports) context.module.exports = {};
+    context.module.exports[name] = item;
+  } else {
+    if(context.module.exports) context.module.exports.default = item;
+    else context.module.exports = item;
+  }
+}
+
+module.exports.pubFunction = function (context) {
+  return function (name, item) {
+    if(name && !item){
+      item = name;
+      name = null;
+    }
+    exportsThe(item, name, context);
+  };
+};
+
 module.exports.exportsFunction = function (context) {
   return function (item, name) {
-    if (name) {
-      context.module.exports[name] = item;
-    } else {
-      context.module.exports = item;
-    }
+    exportsThe(item, name, context);
   };
 };
+

package/lib/rew/functions/fs.js

@@ -18,7 +18,7 @@ module.exports = (currentFile) => {
   }
 
   function exists(filepath, options){
-    return fs.existsSync(filepath);
+    return fs.existsSync(gp(filepath));
   }
 
   function fstat(filepath, options){

package/lib/rew/functions/import.js

@@ -60,7 +60,7 @@ module.exports.imp = function (runPath, context) {
 
     const exec = (coptions = {}) => runPath(
       filepath,
-      { ...options, useContext: execOptions.sharedContext == false ? false : true, ...coptions },
+      { import: options, main: false, useContext: execOptions.sharedContext == false ? false : true, ...coptions },
       execOptions.sharedContext == false ? {} : context,
     ).context.module.exports;
 

package/lib/rew/modules/compiler.js

@@ -1,8 +1,160 @@
 const { compile } = require("../../coffeescript/coffeescript");
 const { getFile } = require("./fs");
 
+function tokenizeCoffeeScript(code) {
+  const tokens = [];
+  let currentToken = '';
+
+  for (let i = 0; i < code.length; i++) {
+    const char = code[i];
+    const nextChar = code[i + 1];
+
+    if (char === '#') {
+      // Comment
+      tokens.push({ type: 'COMMENT', value: char + code.substring(i + 1).split('\n')[0] });
+      i = code.indexOf('\n', i);
+    } else if (char === '"' || char === "'") {
+      // String
+      let string = char;
+      let escaped = false;
+      i++;
+      while (i < code.length && (code[i] !== char || escaped)) {
+        string += code[i];
+        if (code[i] === '\\' && !escaped) {
+          escaped = true;
+        } else {
+          escaped = false;
+        }
+        i++;
+      }
+      string += char; // Include closing quote
+      tokens.push({ type: 'STRING', value: string });
+    } else if (char === '/' && (nextChar === '/' || nextChar === '*')) {
+      // Regular expression
+      let regex = char;
+      i++;
+      while (i < code.length && (code[i] !== '/' || regex.endsWith('\\'))) {
+        regex += code[i];
+        i++;
+      }
+      regex += '/';
+      tokens.push({ type: 'REGEX', value: regex });
+    } else if (/\s/.test(char)) {
+      // Whitespace
+      if(tokens[tokens.length-1]?.type == 'WHITESPACE'
+        && tokens[tokens.length-1].value[0] == char
+      ){
+        tokens[tokens.length-1].value += char;
+      } else {
+        tokens.push({ type: 'WHITESPACE', value: char });
+      }
+    } else if (/[a-zA-Z_$]/.test(char)) {
+      // Identifier
+      let identifier = char;
+      i++;
+      while (i < code.length && /[a-zA-Z0-9_$]/.test(code[i])) {
+        identifier += code[i];
+        i++;
+      }
+      tokens.push({ type: 'IDENTIFIER', value: identifier });
+      i--; // Move back one character to recheck
+    } else {
+      // Other characters
+      tokens.push({ type: 'OTHER', value: char });
+    }
+  }
+
+  return tokens;
+}
+
+const gnextToken = (i, n, tokens) => {
+  return tokens[i + n] ? tokens[i + n].type == 'WHITESPACE' ? gnextToken(i, n + 1, tokens) : { nextToken: tokens[i + n], n } : null;
+}
+
+const fnextToken = (i, tokens, type, value) => {
+  return tokens.map((t, ind) => { t.ti = ind; return t }).slice(i, tokens.length - 1).map((t, ind) => { t.ri = ind; t.index = ind - i; return t }).find(t => t.type == type && (value ? t.value == value : true));
+}
+
+function compileRewStuff(content) {
+  const tokens = tokenizeCoffeeScript(content);
+  let result = '';
+
+  let hooks = [];
+
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i];
+    let { nextToken, n } = gnextToken(i, 1, tokens) || {};
+
+    if (token.type === 'IDENTIFIER' && token.value === 'import') {
+      // console.log(nextToken.type);
+      let ind = i + n + 2;
+
+      let defaultName;
+      if (nextToken.value === '{') {
+        const closingBraceToken = fnextToken(ind, tokens, 'OTHER', '}');
+        const nameToken = fnextToken(ind, tokens, 'STRING');
+        if (closingBraceToken) {
+          const exportsTokens = tokens.slice(ind, closingBraceToken.ti);
+          const exports = exportsTokens.filter(t => t.type === 'IDENTIFIER').map(t => t.value).join(', ');
+          result += `{ ${exports} } = inc ${nameToken.value}`;
+          i = nameToken.ti;
+        }
+      } else if (nextToken.value === '*') {
+        const asToken = fnextToken(ind, tokens, 'IDENTIFIER', 'as');
+        const nameToken = fnextToken(asToken.ri, tokens, 'STRING');
+        if (asToken) {
+          const nextToken = fnextToken(asToken.ti + 1, tokens, 'IDENTIFIER');
+          defaultName = nextToken.value;
+          result += `${defaultName} = inc ${nameToken.value}`;
+          i = ind + 6;
+        }
+      } else {
+        const nameToken = fnextToken(ind, tokens, 'STRING');
+        defaultName = nextToken.value;
+        result += `{ default: ${defaultName} } = inc ${nameToken.value}`;
+        i = ind + 2;
+      }
+
+      const nextLastToken = fnextToken(i, tokens, 'IDENTIFIER');
+
+      if(nextLastToken?.value == 'assert'){
+        result += ', ';
+        i += 3;
+      }
+
+      continue;
+    }
+
+
+    if (token.type === 'IDENTIFIER' && token.value === 'pub' &&
+      nextToken && nextToken.type === 'IDENTIFIER' &&
+      nextToken.value && nextToken.value !== 'undefined') {
+
+      hooks.push({
+        index: i + 1,
+        value: `"${nextToken.value}", `
+      });
+    }
+
+    result += token.value;
+    if (hooks.length) {
+      hooks.forEach((hook, ind) => {
+        if (i == hook.index) {
+          result += hook.value;
+          hooks.splice(ind, 1);
+        }
+      });
+    }
+  }
+
+  // console.log(result)
+
+  return result;
+}
+
+
 const cpl = (module.exports.compile = function (file, options = {}) {
-  return compile(file.content, options);
+  return compile(compileRewStuff(file.content), { ...options, filename: file.path, bare: true, inlineMap: true });
 });
 
 module.exports.compileFile = function (filepath, options = {}) {

package/lib/rew/modules/context.js

@@ -1,11 +1,12 @@
 const defaultContext = require("../const/default");
 const { execOptions } = require("../const/opt");
 const emitter = require("../functions/emitter");
-const { exportsFunction } = require("../functions/export");
+const { exportsFunction, pubFunction } = require("../functions/export");
 const { imp } = require("../functions/import");
 const { customRequire } = require("../functions/require");
 const fsLib = require('../functions/fs');
 const pathLib = require('../functions/path');
+const execLib = require('../functions/exec');
 
 module.exports.prepareContext = function (
   custom_context,
@@ -16,11 +17,15 @@ module.exports.prepareContext = function (
   let context = {
     module: {
       exports: null,
-      options,
       filepath,
+      main: options.main ?? true,
       imports: []
     },
-    ...fsLib(filepath)
+    imports: {
+      meta: {},
+      assert: options.import ?? {}
+    },
+    ...fsLib(filepath),
   };
   if (options.useContext) {
     context = {
@@ -32,6 +37,7 @@ module.exports.prepareContext = function (
       ...context,
       ...defaultContext,
       ...pathLib(filepath),
+      ...execLib(filepath),
       require: (package) => {
         try {
           return execOptions.nativeRequire || package.startsWith('node:') ? require(package.startsWith('node:') ? package.split('node:')[1] : package) : customRequire(package, filepath);
@@ -48,6 +54,14 @@ module.exports.prepareContext = function (
       ...custom_context,
     };
     context.imp = imp(runPath, context);
+    context.inc = (package, asserts) => {
+      try{
+        return context.imp(package, asserts);
+      } catch(e) {
+        return context.require(package);
+      }
+    };
+    context.pub = pubFunction(context);
     context.exports = exportsFunction(context);
   }
   if (!context.global) context.global = context;
@@ -59,6 +73,6 @@ module.exports.prepareContext = function (
       cwd: () => process.cwd(),
       arch: process.arch
     };
-  // console.log(custom_context);
+  context.imports.assert = options.import ?? {};
   return context;
 };

package/lib/rew/pkgs/modules/threads/worker.js

@@ -22,7 +22,7 @@ parentPort.on('message', (data) => {
         exec(`(${workerData.cb}).call({ process }, context)`, { print: (...a) => console.log(...a), process: {
           on: (e, cb) => { target.on(e, cb) },
           off: (e) => { target.off(e) },
-          emit: (e) => { parentPort.postMessage({ type: 'event', event: e, data }) },
+          emit: (e, data) => { parentPort.postMessage({ type: 'event', event: e, data }) },
           exit: (code) => process.exit(code),
           finish: (data) => {
             parentPort.postMessage({ type: 'result', result: data });

package/lib/rew/pkgs/threads.js

@@ -44,7 +44,10 @@ module.exports = (context) => ({
           stop();
         });
 
+        let exiting = false;
+
         worker.on('exit', (code) => {
+          if(exiting) return;
           stop();
           if (code !== 0) {
             throw new Error(`Worker stopped with exit code ${code}`);
@@ -57,7 +60,8 @@ module.exports = (context) => ({
           on: (e, cb) => listener.on(e, cb),
           off: (e, cb) => listener.off(e, cb),
           emit: (e, data) => worker?.postMessage({ type: 'event', event: e, data }),
-          get: () => dataResult.wait()
+          get: () => dataResult.wait(),
+          stop: () => { exiting = true; stop(); }
         };
       }
     };

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.2",
+  "version": "1.1.5",
   "description": "A simple coffescript runtime",
   "main": "lib/rew/main.js",
   "directories": {