@makano/rew 1.2.96 → 1.2.98

package/README.md

@@ -12,9 +12,15 @@ Rew
 <a href="https://www.npmjs.com/package/rayous">  <img src="https://img.shields.io/npm/v/@makano/rew?style=for-the-badge&logo=npm&color=b4befe&logoColor=9399b2&labelColor=181825" alt="npm version" /></a>
 </p>
 
-Rew is a simple lightweight coffeescript runtime, made to simply using coffescript and revive it
+Rew is a simple lightweight coffeescript runtime, made to simplify using coffescript and revive it
 in the process.
 
+```coffee
+using namespace std::ns ->
+  define Main ->
+    print 'hello world' |> str
+```
+
 ## Getting Started
 1. Install `rew` globally
   ```bash

package/lib/rew/cli/run.js

@@ -44,6 +44,11 @@ function runFileWithArgv(filePath, options = {}, cargv) {
 	}
 	if (argv.includes('--')) {
 		argv = argv.slice(argv.indexOf('--') + 1, argv.length);
+	} else {
+		const index = argv.find(p => filePath.endsWith(p.replace(/(\.|\.\.)\//, '/')));
+		if(index){
+			argv = argv.slice(argv.indexOf(index) + 1, argv.length);
+		}
 	}
 	runFile(filePath, options, argv);
 }

package/lib/rew/const/stdns.js

@@ -0,0 +1 @@
+module.exports = class STDNS {}

package/lib/rew/const/usage.js

@@ -1,8 +1,9 @@
+const STDNS = require("./stdns");
 
 
 
 const JSX_FRAGMENT_SYMBOL = Symbol('fragment');
-module.exports.USING_DEFAULT = {
+const USING_DEFAULT = module.exports.USING_DEFAULT = {
   JSX: {
     param: (param, fragment) => param ? ({ createElement: param, Fragment: fragment || param(JSX_FRAGMENT_SYMBOL, { isFragment: true }), fragmentSymbol: JSX_FRAGMENT_SYMBOL }) : {},
     use:  (options) => options.jsx = true
@@ -15,7 +16,7 @@ module.exports.USING_DEFAULT = {
   }
 }
 
-module.exports.Usage = class Usage {
+class Usage {
   name = "null";
   trigger = () => {};
   save = true;
@@ -61,6 +62,7 @@ module.exports.Usage = class Usage {
     }
   }
 }
+module.exports.Usage = Usage;
 
 class Namespace extends module.exports.Usage {
   namespace = {};
@@ -84,7 +86,44 @@ class Namespace extends module.exports.Usage {
 module.exports.Namespace = Namespace;
 
 module.exports.namespace = (namespace, cb, parent) => {
+  if(namespace instanceof STDNS) {
+    if(namespace['@cb'] && !cb) {
+      cb = namespace['@cb'];
+      delete namespace['@cb'];
+    }
+  }
   return new Namespace(namespace, cb, parent);
 }
 
+module.exports.usingFunction = (context, runtime) => {
+  return function using(name, ...params) {
+    if(name instanceof Usage.Group){
+      params.unshift(...name.g.slice(1));
+      name = name.g[0];
+    }
+    if(USING_DEFAULT[name]){
+      if(USING_DEFAULT[name].param) {
+        context.__using__[name] = USING_DEFAULT[name].param(...params);
+      }
+    } else if(name instanceof Namespace) {
+      const trigger = name.trigger;
+      const parentContext = name.parent || context;
+      const childContext = {...parentContext, ...name.namespace, trigger};
+      childContext.$self = name.namespace;
+      childContext.$parent = parentContext;
+      const code = `(${trigger.toString()})()`;
+      if(name.onUse) name.onUse();    
+      const r = runtime.exec(code, childContext, code, context.module.filepath);
+      if(name.onAfterUse) name.onAfterUse();
+      return r;
+    } else if(name instanceof Usage) {
+      const v = name.trigger(...params) || true;
+      if(name.save !== false) context.__using__[name.name] = v;
+      return v;
+    } else {
+      context.__using__[name] = params.length ? params.length > 1 ? [...params] : params : true;
+    }
+  }
+}
+
 module.exports.namespace.group = (group, props) => new Namespace.Group(group, props);

package/lib/rew/functions/import.js

@@ -43,9 +43,10 @@ const lookUpInOtherApps = (fullPath) => {
 module.exports.imp = function (runPath, context) {
 	return function (filename, options = {}) {
 		if (!options) options = {};
+		if(filename == 'std' || filename == '#std') return {};
 		let type = options.type ? options.type : filename.endsWith('.coffee') ? 'coffee' : (
 			filename.endsWith(REW_FILE_TYPE.EXTENSION) ? REW_FILE_TYPE.TYPE :
-			path.extname(filename).slice(1)
+			'coffee'
 		);
 		let exports,
 			ispkg = findPackage(filename);

package/lib/rew/functions/types.js

@@ -36,7 +36,7 @@ function typedef(value, strict = false) {
 					? value.constructor
 					: _defaultConstructors[getType(value)],
 		type: getType(value),
-		isConstucted: typeof value === 'object' && value !== null && !Array.isArray(value),
+		isConstructed: typeof value === 'object' && value !== null && !Array.isArray(value),
 		isEmpty: typeof value == 'object' ? !Object.keys(value).length : typeof value == 'string' ? value == '' : typeof value !== 'function',
 	});
 }
@@ -70,7 +70,7 @@ function typeis(obj, typeDef, missingObjects = false) {
 	// Resolve Type
 	if (typeof typeDef == 'function' && typeDef.type instanceof Type) typeDef = typeDef.type;
 
-	if (typeDef.isConstucted && typeDef.class && !(obj instanceof typeDef.class)) {
+	if (typeDef.isConstructed && typeDef.class && !(obj instanceof typeDef.class)) {
 		return missingObjects ? [false] : false;
 	}
 

package/lib/rew/modules/compiler.js

@@ -285,7 +285,7 @@ function useImp(token, options){
 		let packageName = value.slice(1);
 		token.value = dem+packageName+dem;
 		straceLog('IMP() with HEADER for', packageName);
-		return includeFile(packageName, options); 
+		return includeFile(packageName !== 'std' ? packageName : '*'+packageName, options); 
 	}
 	return '';
 }
@@ -378,7 +378,7 @@ function compileRewStuff(content, options) {
 		
     if (token.type === 'COMMENT' && token.value.slice(1).trim() === '@cls') {
 			options.cls = true;
-			straceLog('CLITOKENIZATION() ENABLE');
+			straceLog('CLI_SYNTAX() ENABLE');
 			straceLog('===> HIGHLY EXPERIMENTAL FEATURE DETECTED');
 		}
 
@@ -401,6 +401,25 @@ function compileRewStuff(content, options) {
 			token.value = 'pub';
 			straceLog('EXPORT() => TRANSLATING TO pub');
 		}
+		
+		if (token.type === 'IDENTIFIER' && token.value === 'package' && nextToken.type == 'STRING') {
+			token.value = 'appPackage';
+			straceLog('APP_PACKAGE_CHANGE()');
+		}
+
+		if (
+			token.type === 'OTHER' && token.value === '-' &&
+			nextToken.type == 'IDENTIFIER' && nextToken.value === 'wait'
+		) {
+			const { token: nextNextToken } = gnextToken(i, 2, tokens) || {};
+			if(nextNextToken?.type == 'IDENTIFIER'){
+				token.value = '';
+				hooks.push({
+					index: i + 3,
+					value: ','
+				});
+			}
+		}
 
 		if (token.type === 'IDENTIFIER' && token.value === 'using' && !options.disableUse) {
 			straceLog('USING()');
@@ -432,15 +451,15 @@ function compileRewStuff(content, options) {
 		if (token.type === 'IDENTIFIER' && token.value === 'import' && !options.keepImports) {
 			// console.log(nextToken.type);
 			straceLog('IMPORT()');
-			straceLog('==> WARN: SLOWS DOWN TOKENIZATION');
+			straceLog('==> WARN: SLOWS DOWN COMPILATION');
 			let ind = i + n + 2;
 			let isAs = false;
 
 			let defaultName;
 			if (nextToken.type === 'STRING') {
 				straceLog('==> SIMPLE');
+				if(useImp(nextToken, options)) updateAliases(aliases);
 				result += `inc ${nextToken.value}`;
-				if(useImp(nameToken, options)) updateAliases(aliases);
 				i += n;
 			} else if (nextToken.value === '{') {
 				const closingBraceToken = fnextToken(ind, tokens, 'OTHER', '}');

package/lib/rew/modules/context.js

@@ -8,11 +8,11 @@ const pathLib = require("../functions/path");
 const path = require("path");
 const execLib = require("../functions/exec");
 const { findAppInfo } = require("../misc/findAppInfo");
-const { USING_DEFAULT, Usage, Namespace } = require("../const/usage");
+const { Usage, usingFunction } = require("../const/usage");
 const runtime = require("./runtime");
-const { permission } = require("process");
 const { straceLog } = require("../misc/strace");
 const reval = require("../functions/reval");
+const STDNS = require("../const/stdns");
 
 let mainFile = "";
 const isMainFile = (filepath) => filepath == mainFile;
@@ -47,14 +47,41 @@ module.exports.prepareContext = function (
       ...context,
     };
   } else {
+    const std = {...defaultContext};
     context = {
       ...context,
-      ...defaultContext,
+      ...std,
       ...pathLib(filepath),
       ...execLib(filepath),
       ...custom_context,
       Usage
     };
+    std.prototype = { ns: (cb) => {
+      return new (class extends STDNS {
+        constructor(){
+          super();
+          for(let i in std){
+            this[i] = std[i];
+          }
+          this.define = std.prototype.define;
+          this.Main = std.prototype.Main;
+          this['@cb'] = cb;
+        }
+      });
+    }, define: (name, object) => {
+      if(Array.isArray(name) && name.length == 2 && typeof name[0] == 'string'){
+        object = name[1];
+        name = name[0];
+      }
+      if(!context.module.exports) context.module.exports = {};
+      context.module.exports[name] = object;
+      context[name] = object;
+    }, Main: (cb) => (['main', cb?.main ?? cb]), attach: (object) => {
+      for(let i in object){
+        if(!context[i]) context[i] = object[i];
+      }
+    } }
+    context.std = std;
   }
   if (!context.process)
     context.process = {
@@ -70,10 +97,19 @@ module.exports.prepareContext = function (
       abort: () => process.abort(),
       kill: () => process.kill(),
       exit: (code) => process.exit(code),
+      chdir: (dir) => process.chdir(dir),
+      disconnect: () => process.disconnect(),
       arch: process.arch,
       pid: process.pid,
       platform: process.platform,
-      permission: process.permission
+      channel: process.channel,
+      uptime: () => process.uptime(),
+      nextTick: (callback, ...args) => process.nextTick(callback, ...args),
+      permission: process.permission,
+      transmit: {
+        send: (...data) => process.send(...data),
+        recieve: (cb) => process.on('message', cb)
+      }
     };
 
   context.global = context;
@@ -120,34 +156,7 @@ module.exports.prepareContext = function (
   context.pub = pubFunction(context);
   context.exports = exportsFunction(context);
 
-  context.using = (name, ...params) => {
-    if(name instanceof Usage.Group){
-      params.unshift(...name.g.slice(1));
-      name = name.g[0];
-    }
-    if(USING_DEFAULT[name]){
-      if(USING_DEFAULT[name].param) {
-        context.__using__[name] = USING_DEFAULT[name].param(...params);
-      }
-    } else if(name instanceof Namespace) {
-      const trigger = name.trigger;
-      const parentContext = name.parent || context;
-      const childContext = {...parentContext, ...name.namespace, trigger};
-      childContext.currentNamespace = name.namespace;
-      childContext.parentNamespace = parentContext;
-      const code = `(${trigger.toString()})()`;
-      if(name.onUse) name.onUse();    
-      const r = runtime.exec(code, childContext, code, context.module.filepath);
-      if(name.onAfterUse) name.onAfterUse();
-      return r;
-    } else if(name instanceof Usage) {
-      const v = name.trigger(...params) || true;
-      if(name.save !== false) context.__using__[name.name] = v;
-      return v;
-    } else {
-      context.__using__[name] = params.length ? params.length > 1 ? [...params] : params : true;
-    }
-  };
+  context.using = usingFunction(context, runtime);
 
   if(context.app?.config?.exec?.['auto import']){
     const autoipath = path.join(context.app.path, context.app.config?.exec?.['auto import']);

package/lib/rew/modules/runtime.js

@@ -54,7 +54,7 @@ module.exports.runPath = function runPath(filepath, options = {}, custom_context
 			const mainFn = context.module.exports.main ?? context.module.exports;
 			return {
 				context,
-				returns: mainFn(context.process.argv)
+				returns: mainFn.call(context, context.process.argv)
 			}
 		} else {
 			return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.2.96",
+  "version": "1.2.98",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {