@makano/rew 1.1.0 → 1.1.2

package/README.md

@@ -1,5 +1,5 @@
 <h3 align="center">
-<img src="https://raw.githubusercontent.com/kevinJ045/rew/main/assets/logo.png" width="100" />
+<img src="https://raw.githubusercontent.com/kevinJ045/rew-docs/main/assets/logo.png" width="100" />
 <br/>
 Rew
 <br/>

package/bin/rew

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 const path = require('path');
 const fs = require('fs');
-const rew_mod = path.resolve(process.cwd(), 'node_modules/@makano/rew');
+const rew_mod = path.resolve(process.cwd(), 'snode_moduless/@makano/rew');
 if(fs.existsSync(rew_mod)){
   require(path.join(rew_mod, 'lib/rew/cli/cli.js'));
 } else {

package/lib/rew/cli/cli.js

@@ -3,9 +3,11 @@
 const yargs = require('yargs/yargs');
 const path = require('path');
 const { hideBin } = require('yargs/helpers');
-const { fork } = require('child_process');
+const { fork, exec } = require('child_process');
 const { watch } = require('chokidar');
 const utils = require('./utils');
+const { existsSync } = require('fs');
+const { log } = require('./log');
 
 yargs(hideBin(process.argv))
   .command(
@@ -25,6 +27,10 @@ yargs(hideBin(process.argv))
     },
     (argv) => {
       const filePath = path.resolve(process.cwd(), argv.file);
+      if(!existsSync(filePath)){
+        log('File not found:', argv.file, ':end');
+        return;
+      }
       const watching = [];
       const watchIt = (file) => {
         if(watching.includes(file)) return;
@@ -41,8 +47,6 @@ yargs(hideBin(process.argv))
             data.forEach(file => {
               watchIt(file);
             });
-          } else {
-            process.exit();
           }
         }).send({ filePath, watch: argv.watch });
         if(argv.watch) watchIt(filePath);
@@ -104,6 +108,18 @@ yargs(hideBin(process.argv))
       utils.runApp(argv.path);
     }
   )
+  .command('install <path>',  'Install an app', (yargs) => {
+    yargs
+      .positional('path', {
+        describe: 'Path of the app to install',
+        type: 'string',
+      });
+    },
+    async (argv) => {
+      if(argv.path.startsWith('github:')) utils.installApp(await utils.cloneGit(argv.path), true, true);
+      else utils.installApp(argv.path);
+    }
+  )
   .command('build <file>', 'Build the specified file', (yargs) => {
     yargs
       .positional('file', {

package/lib/rew/cli/run.js

@@ -1,6 +1,4 @@
-const path = require('path');
 const { run } = require('../main');
-const { watch } = require('fs');
 
 
 function exec(filePath){
@@ -8,13 +6,12 @@ function exec(filePath){
     .context.module.imports;
 }
 
-
-process.on('message', ({ filePath, watch }) => {
+const onmsg = ({ filePath, watch }) => {
   const imports = exec(filePath);
   if(watch){
     process.send(imports);
-    process.exit();
-  } else {
-    process.exit();
   }
-});
+  process.off('message', onmsg);
+}
+
+process.on('message', onmsg);

package/lib/rew/cli/utils.js

@@ -4,8 +4,9 @@ const conf = require('../pkgs/conf');
 const jsYaml = require('js-yaml');
 const readline = require('readline');
 const { log, logget } = require('./log');
-const { execSync } = require('child_process');
+const { execSync, exec } = require('child_process');
 const { run } = require('../main');
+const { generateRandomID } = require('../functions/id');
 
 const npm_package_name = '@makano/rew';
 
@@ -68,6 +69,7 @@ module.exports = {
       fs.writeFileSync(confPath, jsYaml.dump({ package: project.package, entry: 'main.coffee' }));
       fs.writeFileSync(entryFile, `print("Hello World!")`);
       if(project.git) {
+        fs.writeFileSync(path.join(projectPath, '.gitignore'), `node_modules/\npackage-lock.json`);
         execSync('cd '+projectPath+' && git init .');
       }
       log('Installing '+npm_package_name);
@@ -104,7 +106,14 @@ module.exports = {
     const runAppRoot = (root, confPath) => {
       const c = jsYaml.load(fs.readFileSync(confPath, { encoding: 'utf-8' }));
       if(c.entry){
-        run(path.resolve(root, c.entry));
+        const r = path.resolve(root, c.entry);
+        const mod_path = path.resolve(root, 'snode_moduless/@makano/rew');
+        const mod_path_lib = path.join(mod_path, 'lib/rew/cli');
+        if(fs.existsSync(mod_path) && __dirname !== mod_path_lib){
+          const mod_path_utilsjs = path.join(mod_path_lib, '../main.js');
+          require(mod_path_utilsjs)
+          .run(r);
+        } else run(r);
       }
     }
 
@@ -112,11 +121,70 @@ module.exports = {
       runAppRoot(apppath, appConfpath);
     } else {
       const con = conf({});
-      const apppath = path.resolve(con.CONFIG_PATH, pathOrPackage, '$app');
+      const apppath = path.resolve(con.CONFIG_PATH, pathOrPackage, 'app');
       const appConfpath = path.join(apppath, 'app.yaml');
       if(fs.existsSync(apppath) && fs.existsSync(appConfpath)){
         runAppRoot(apppath, appConfpath);
       }
     }
+  },
+  installApp(pathname, rmidir, rmidiri){
+    if(!pathname){
+      return;
+    }
+    const apppath = path.resolve(process.cwd(), pathname);
+    const appConfpath = path.join(apppath, 'app.yaml');
+    const appPackagepath = path.join(apppath, 'package.json');
+    if(fs.existsSync(apppath) && fs.existsSync(appConfpath)){
+      const c = jsYaml.load(fs.readFileSync(appConfpath, { encoding: 'utf-8' }));
+      const p = JSON.parse(fs.readFileSync(appPackagepath, { encoding: 'utf-8' }));
+      const pname = c.package;
+      const installPath = path.join(conf({}).create(pname).root, 'app');
+      const rl = readline.createInterface({
+        input: process.stdin,
+        output: process.stdout
+      });    
+      log('Installing '+pname);
+      log("Package: "+p.name+'@'+p.version);
+      if(p.description){
+        log("Description: "+p.description);
+      }
+      rl.question(logget('Install '+pname+'? (y/N)'), (f) => {
+        if(f.toLowerCase() == 'y'){
+          if(fs.existsSync(installPath)){
+            execSync(`rm -r ${installPath}`);
+          }
+          execSync(`cp -r ${apppath} ${installPath}`);
+          if(rmidir){
+            execSync(`rm -r ${apppath}`);
+          }
+          log('Installed '+pname, ':end');
+          rl.close();
+        } else {
+          if(rmidiri){
+            execSync(`rm -r ${apppath}`);
+          }
+          log('Canceled install', ':end');
+          rl.close();
+        }
+      });
+    } else {
+      log('Path is not a rew app', ':end');
+    }
+  },
+  async cloneGit(gitpath){
+    const p = gitpath.split('github:')[1];
+    const url = `https://github.com/${p}`;
+    const apiurl = `https://api.github.com/repos/${p}`;
+    return await fetch(apiurl)
+    .then((r) => {
+      if(r.status !== 200) return log('Repo not found', ':end');
+      const tempPath = '/tmp/rew-git-clone-'+p.replace(/\//g, '_')+'-'+generateRandomID();
+      execSync(`git clone ${url} ${tempPath}`);
+      console.log('Installing deps...');
+      execSync(`cd ${tempPath} && npm i`);
+      return tempPath;
+    })
+    .catch(r => null);
   }
 }

package/lib/rew/const/default.js

@@ -5,8 +5,9 @@ const future = require("../functions/future");
 const sleep = require("../functions/sleep");
 const { match } = require("../functions/match");
 const { map } = require("../functions/map");
-const { typex, typeis, typedef, typei } = require("../functions/types");
+const { typex, typeis, typedef, typei, int, float, num, str, bool } = require("../functions/types");
 const { isEmpty, clone, deepClone, merge, uniqueId, compose, curry } = require("../functions/core");
+const { print, input } = require("../functions/stdout");
 
 module.exports = {
   cenum,
@@ -16,11 +17,18 @@ module.exports = {
   sleep,
   match,
   map,
+
   typex,
   typei,
   typeis,
   typedef,
 
+  int,
+  float,
+  num,
+  str,
+  bool,
+
   isEmpty,
   clone,
   deepClone,
@@ -29,7 +37,6 @@ module.exports = {
   compose,
   curry,
 
-  print: function (...arguments) {
-    return console.log(...arguments);
-  },
+  print,
+  input
 };

package/lib/rew/const/opt.js

@@ -0,0 +1,8 @@
+const execOptions = {
+  sharedContext: true,
+  resolveExtensions: [{ext: '.js', options: { type: 'js' }}, '.coffee'],
+  nativeRequire: false,
+  cwdAlias: '$'
+}
+
+module.exports.execOptions = execOptions;

package/lib/rew/functions/core.js

@@ -1,4 +1,5 @@
 
+
 function isEmpty(value) {
   if (Array.isArray(value) || typeof value === 'string') {
     return value.length === 0;

package/lib/rew/functions/fs.js

@@ -0,0 +1,54 @@
+const fs = require('fs');
+const path = require('path');
+const { execOptions } = require('../const/opt');
+
+
+module.exports = (currentFile) => {
+
+  function gp(filepath){
+    return path.resolve(filepath.startsWith(execOptions.cwdAlias) ? process.cwd() : path.dirname(currentFile), filepath.replaceAll(execOptions.cwdAlias+'/', ''));
+  }
+
+  function read(filepath, options = { encoding: 'utf-8' }){
+    return fs.readFileSync(gp(filepath), options);
+  }
+
+  function write(filepath, content, options){
+    return fs.writeFileSync(gp(filepath), content, options);
+  }
+
+  function exists(filepath, options){
+    return fs.existsSync(filepath);
+  }
+
+  function fstat(filepath, options){
+    return fs.statSync(gp(filepath), options);
+  }
+
+  function rm(filepath, options){
+    return fs.unlinkSync(filepath);
+  }
+
+  function chmod(filepath, mode, options){
+    return fs.chmodSync(gp(filepath), mode);
+  }
+
+  function mkdir(filepath, options){
+    return fs.mkdirSync(gp(filepath), options);
+  }
+
+  function ls(filepath, options){
+    return fs.readdirSync(gp(filepath), options);
+  }
+
+  return {
+    ls,
+    mkdir,
+    chmod,
+    rm,
+    fstat,
+    exists,
+    write,
+    read
+  };
+} 

package/lib/rew/functions/future.js

@@ -14,9 +14,10 @@ module.exports = function future(callback, timeout = 0, defData = null) {
   });
   return {
     pipe: (callback) => promise.then(callback),
-    pipex: (callback) => promise.finally(callback),
+    last: (callback) => promise.finally(callback),
     catch: (callback) => promise.catch(callback),
     resolve: (data) => listener.emit("resolve", data),
     reject: (data) => listener.emit("reject", data),
+    wait: async () => await promise 
   };
 };

package/lib/rew/functions/import.js

@@ -2,6 +2,26 @@ const path = require("path");
 const { getFile, file } = require("../modules/fs");
 const { importYaml } = require("../modules/yaml");
 const { findPackage, getPackage } = require("../pkgs/pkgs");
+const { existsSync, readFileSync } = require("fs");
+const conf = require("../pkgs/conf");
+const jsYaml = require("js-yaml");
+const { execOptions } = require("../const/opt");
+
+const cachedFiles = [];
+
+const lookUpInOtherApps = (fullPath) => {
+  const con = conf({});
+  const name = fullPath.indexOf('/') ? fullPath.split('/')[0] : fullPath;
+  let dpath = fullPath.indexOf('/') ? fullPath.split('/')[1] : '';
+  let ppath = path.join(con.CONFIG_PATH, name, 'app');
+  if(!existsSync(ppath)) return null;
+  if(!dpath){
+    dpath = jsYaml.load(readFileSync(path.join(ppath, 'app.yaml'), 'utf-8')).entry;
+  }
+  ppath = path.join(ppath, dpath);
+  if(existsSync(ppath)) return ppath;
+  else return null;
+}
 
 module.exports.imp = function (runPath, context) {
   return function (filename, options = {}) {
@@ -9,24 +29,49 @@ module.exports.imp = function (runPath, context) {
     let exports,
       ispkg = findPackage(filename);
 
-    const filepath = path.resolve(path.dirname(context.module.filepath), filename);
+    let filepath = path.resolve(path.dirname(context.module.filepath), filename);
 
     // console.log(typeof runPath);
 
+    const lookUp = () => {
+      const otherPath = lookUpInOtherApps(filename);
+      if(!otherPath) throw new Error('Module "'+filename+'" not found');
+      else filepath = otherPath;
+    }
+
+    const foundCache = cachedFiles.find(f => f.filepath == filepath);
+
+    if(!ispkg && foundCache){
+      exports = foundCache.exports;
+    }
+
+    if(!ispkg && !existsSync(filepath)){
+      if(Array.isArray(execOptions.resolveExtensions) && execOptions.resolveExtensions.length){
+        const resolve = execOptions.resolveExtensions.find(ext => typeof ext == "string" ? existsSync(filepath+ext) : existsSync(filepath+(ext.ext || '')));
+        if(resolve) {
+          filepath += typeof resolve == "string" ? resolve : resolve.ext;
+          if(typeof resolve == "object" && resolve.options){
+            if(resolve.options.type) type = resolve.options.type;
+            for(let i in resolve.options) options[i] = resolve.options[i];  
+          }
+        } else lookUp();
+      } else lookUp();
+    }
+
+    const exec = (coptions = {}) => runPath(
+      filepath,
+      { ...options, useContext: execOptions.sharedContext == false ? false : true, ...coptions },
+      execOptions.sharedContext == false ? {} : context,
+    ).context.module.exports;
+
     if (ispkg) {
       exports = getPackage(filename)(context);
+    } else if(foundCache) {
+      
     } else if (type == "coffee") {
-      exports = runPath(
-        filepath,
-        { ...options, useContext: true },
-        context,
-      ).context.module.exports;
+      exports = exec({ });
     } else if (type == "js") {
-      exports = runPath(
-        filepath,
-        { ...options, useContext: true, compile: false },
-        context,
-      ).context.module.exports;
+      exports = exec({ compile: false });
     } else if (type == "yaml" || type == "json" || type == "text") {
       const f = getFile(filepath);
       if (type == "yaml") {
@@ -51,6 +96,7 @@ module.exports.imp = function (runPath, context) {
     }
 
     if(!ispkg) context.module.imports.push(filepath);
+    if(!ispkg) cachedFiles.push({ filepath, exports });
 
     return exports;
   };

package/lib/rew/functions/path.js

@@ -0,0 +1,13 @@
+const path = require('path');
+
+module.exports = (currentFile) => {
+  const e = {};
+  e.basename = (pathname, suffix) => path.basename(pathname, suffix);
+  e.dirname = (pathname) => path.dirname(pathname);
+  e.extname = (pathname) => path.extname(pathname);
+
+  e.pjoin = (...paths) => path.join(...paths);
+  e.presolve = (...paths) => path.resolve(...paths);
+
+  return e;
+}

package/lib/rew/functions/require.js

@@ -0,0 +1,41 @@
+const fs = require('fs');
+const path = require('path');
+
+
+module.exports.customRequire = function customRequire(modulePath, filePath) {
+  const resolvedPath = resolveModulePath(modulePath, filePath);
+  return require(resolvedPath);
+}
+
+function resolveModulePath(modulePath, filePath) {
+  if (modulePath.startsWith('./') || modulePath.startsWith('../') || path.isAbsolute(modulePath)) {
+    return path.resolve(modulePath);
+  }
+
+  const paths = module.constructor._nodeModulePaths(path.dirname(filePath));
+  for (const basePath of paths) {
+    const fullPath = path.join(basePath, modulePath);
+    if (fs.existsSync(fullPath + '.js')) {
+      return fullPath + '.js';
+    }
+    if (fs.existsSync(fullPath + '.json')) {
+      return fullPath + '.json';
+    }
+    if (fs.existsSync(fullPath) && fs.statSync(fullPath).isDirectory()) {
+      const packageJsonPath = path.join(fullPath, 'package.json');
+      if (fs.existsSync(packageJsonPath)) {
+        const main = require(packageJsonPath).main || 'index.js';
+        const mainPath = path.join(fullPath, main);
+        if (fs.existsSync(mainPath)) {
+          return mainPath;
+        }
+      }
+      const indexPath = path.join(fullPath, 'index.js');
+      if (fs.existsSync(indexPath)) {
+        return indexPath;
+      }
+    }
+  }
+
+  throw new Error(`Cannot find module '${modulePath}'`);
+}

package/lib/rew/functions/stdout.js

@@ -0,0 +1,30 @@
+const { execSync, spawnSync } = require('child_process');
+const fs = require('fs');
+
+const print = module.exports.print = function print(...arguments) {
+  return console.log(...arguments);
+};
+
+print.stdout = process.stdout;
+print.stdin = process.stdin;
+
+module.exports.input = function input(prompt) {
+  process.stdout.write(prompt);
+
+  let cmd;
+  let args;
+  if ("null" == "win32") {
+    cmd = 'cmd';
+    args = ['/V:ON', '/C', 'set /p response= && echo !response!'];
+  } else {
+    cmd = 'bash';
+    args = ['-c', 'read response; echo "$response"'];
+  }
+
+  let opts = {
+    stdio: ['inherit', 'pipe'],
+    shell: false,
+  };
+  
+  return spawnSync(cmd, args, opts).stdout.toString().trim();
+}

package/lib/rew/functions/types.js

@@ -67,11 +67,39 @@ function typei(child, parent) {
   return child instanceof parent || child.constructor === parent;
 }
 
+function int(str){
+  return parseInt(str);
+}
+
+function float(str){
+  return parseFloat(str);
+}
+
+function num(str){
+  return Number(str);
+}
+
+function str(str){
+  return str ? str.toString() : "";
+}
+
+function bool(value){
+  return typeof value == 'string' ? (
+    value == 'true' ? true : false
+  ) : value !== null && value !== undefined;
+}
+
 module.exports = {
   typex,
   typei,
   typeis,
-  typedef
+  typedef,
+  
+  int,
+  float,
+  num,
+  str,
+  bool
 }
 
 

package/lib/rew/modules/context.js

@@ -1,7 +1,11 @@
 const defaultContext = require("../const/default");
+const { execOptions } = require("../const/opt");
 const emitter = require("../functions/emitter");
 const { exportsFunction } = require("../functions/export");
 const { imp } = require("../functions/import");
+const { customRequire } = require("../functions/require");
+const fsLib = require('../functions/fs');
+const pathLib = require('../functions/path');
 
 module.exports.prepareContext = function (
   custom_context,
@@ -16,6 +20,7 @@ module.exports.prepareContext = function (
       filepath,
       imports: []
     },
+    ...fsLib(filepath)
   };
   if (options.useContext) {
     context = {
@@ -26,13 +31,20 @@ module.exports.prepareContext = function (
     context = {
       ...context,
       ...defaultContext,
+      ...pathLib(filepath),
       require: (package) => {
         try {
-          return require(package);
+          return execOptions.nativeRequire || package.startsWith('node:') ? require(package.startsWith('node:') ? package.split('node:')[1] : package) : customRequire(package, filepath);
         } catch (e) {
-          throw new Error("Module not found");
+          throw new Error("Module "+package+" not found");
         }
       },
+      opt: {
+        set: (key, value) => execOptions[key] = value,
+        get: (key) => execOptions[key],
+        push: (key, value) => execOptions[key]?.push(value),
+        pop: (key) => execOptions[key]?.pop()
+      },
       ...custom_context,
     };
     context.imp = imp(runPath, context);
@@ -44,6 +56,8 @@ module.exports.prepareContext = function (
       argv: process.argv,
       target: emitter(),
       env: process.env,
+      cwd: () => process.cwd(),
+      arch: process.arch
     };
   // console.log(custom_context);
   return context;

package/lib/rew/pkgs/env.js

@@ -0,0 +1,9 @@
+
+
+module.exports = (context) => ({
+  has: (key) => key in process.env,
+  get: (key) => process.env[key],
+  set: (key, value) => process.env[key] = value,
+  rm: (key) => delete process.env[key],
+  is: (key, value) => process.env[key] == value
+})

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

@@ -0,0 +1,37 @@
+const { parentPort, workerData } = require('worker_threads');
+const { exec } = require('../../../modules/runtime');
+
+const target = {};
+target.events = [];
+target.on = (e, cb) => {
+  target.events.push({ e, cb });
+}
+target.off = (e) => {
+  target.events = target.events.filter(i => i.e !== e);
+}
+target.emit = (e, data) => {
+  target.events.filter(i => i.e == e).forEach(i => i.cb(data));
+}
+
+parentPort.on('message', (data) => {
+  if (data.type === 'event') {
+    target.emit(data.event, data.data);
+  } else if (data.type === 'start') {
+    (async () => {
+      try {
+        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 }) },
+          exit: (code) => process.exit(code),
+          finish: (data) => {
+            parentPort.postMessage({ type: 'result', result: data });
+            process.exit(0)
+          }
+        }, context: workerData.context })
+      } catch (e) {
+        parentPort.postMessage({ type: 'error', error: e.message });
+      }
+    })();
+  }
+});

package/lib/rew/pkgs/threads.js

@@ -0,0 +1,67 @@
+const { Worker } = require('worker_threads');
+const emitter = require('../functions/emitter');
+const future = require('../functions/future');
+const { struct } = require('../models/struct');
+const path = require('path');
+
+module.exports = (context) => ({
+  thread: (cb) => {
+    const workers = [];
+
+    const stopWorker = (worker) => {
+      workers.splice(workers.indexOf(worker), 1);
+      worker.terminate()
+    };
+
+    const athread = {
+      stopAll: () => {
+        if (!run) return;
+        workers.forEach(stopWorker);
+      },
+      start: (context) => {
+        let dataResult = future(() => {}), listener = emitter();
+        const worker = new Worker(path.resolve(__dirname, './modules/threads/worker.js'), {
+          workerData: { context, cb: cb.toString() }
+        });
+        workers.push(worker);
+
+        const stop = () => stopWorker(worker);
+
+        worker.on('message', (data) => {
+          if (data.type === 'result') {
+            dataResult.resolve(data.result);
+            stop();
+          } else if (data.type === 'error') {
+            reject(new Error(data.error));
+            stop();
+          } else if (data.type === 'event') {
+            listener.emit(data.event, data.data);
+          }
+        });
+
+        worker.on('error', (error) => {
+          console.log(error);
+          stop();
+        });
+
+        worker.on('exit', (code) => {
+          stop();
+          if (code !== 0) {
+            throw new Error(`Worker stopped with exit code ${code}`);
+          }
+        });
+
+        worker.postMessage({ type: 'start' });
+
+        return {
+          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()
+        };
+      }
+    };
+
+    return athread;
+  }
+});

package/package.json

@@ -1,16 +1,13 @@
 {
   "name": "@makano/rew",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "A simple coffescript runtime",
   "main": "lib/rew/main.js",
   "directories": {
     "lib": "lib"
   },
   "scripts": {
-    "test": "node test/test.js",
-    "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs"
+    "test": "node test/test.js"
   },
   "files": [
     "lib/",
@@ -32,7 +29,6 @@
     "chokidar": "^3.6.0",
     "js-yaml": "^4.1.0",
     "vm": "^0.1.0",
-    "ws": "^8.17.0",
     "yargs": "^17.7.2"
   },
   "devDependencies": {