@makano/rew 1.1.15 → 1.1.21

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

@@ -1,7 +1,8 @@
 const execOptions = {
   sharedContext: true,
   resolveExtensions: [{ext: '.js', options: { type: 'js' }}, '.coffee'],
-  nativeRequire: false
+  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/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

@@ -3,12 +3,8 @@ const path = require('path');
 
 
 module.exports.customRequire = function customRequire(modulePath, filePath) {
-  try{
-    return require(modulePath)
-  } catch(e){
-    const resolvedPath = resolveModulePath(modulePath, filePath);
-    return require(resolvedPath);
-  }
+  const resolvedPath = resolveModulePath(modulePath, filePath);
+  return require(resolvedPath);
 }
 
 function resolveModulePath(modulePath, filePath) {

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

@@ -4,7 +4,8 @@ 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,
@@ -19,12 +20,7 @@ module.exports.prepareContext = function (
       filepath,
       imports: []
     },
-    opt: {
-      set: (key, value) => execOptions[key] = value,
-      get: (key) => execOptions[key],
-      push: (key, value) => execOptions[key]?.push(value),
-      pop: (key) => execOptions[key]?.pop()
-    }
+    ...fsLib(filepath)
   };
   if (options.useContext) {
     context = {
@@ -35,13 +31,20 @@ module.exports.prepareContext = function (
     context = {
       ...context,
       ...defaultContext,
+      ...pathLib(filepath),
       require: (package) => {
         try {
-          return execOptions.nativeRequire ? require(package) : customRequire(package, filepath);
+          return execOptions.nativeRequire || package.startsWith('node:') ? require(package.startsWith('node:') ? package.split('node:')[1] : package) : customRequire(package, filepath);
         } catch (e) {
           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);

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/package.json

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