@makano/rew 1.2.89 → 1.2.901

package/lib/rew/const/usage.js

@@ -23,7 +23,7 @@ module.exports.Usage = class Usage {
   constructor(name, trigger, save){
     this.name = name;
     this.trigger = trigger;
-    this.save = save;
+    this.save = name == '' ? false : save;
   }
 
   create(name, trigger, save = true){

package/lib/rew/modules/compiler.js

@@ -139,7 +139,7 @@ function declareAlias(aliases, token) {
 		straceLog('==> DECLARE', name, 'as', value);
 
     let aliasValue = value.startsWith('${')
-      ? new Function('token', 'tokens', 'code', 'hooks', value.slice(2, -1))
+      ? new Function('token', 'tokens', 'code', 'hooks', 'index', 'setIndex', value.slice(2, -1))
       : value;
 		
 
@@ -172,7 +172,7 @@ function declareAlias(aliases, token) {
 					let nextToken = gnextToken(index, offset+1, tokens);
 					const args = nextToken.token.value;
 					setIndex(ti + offset);
-					return `${nextToken2.value} = ${token.value}(${args}, ${params.trim()})`;
+					return `${nextToken2.value} = ${token.value} ${args && args !== '(' ? `${args},` : ''} ${params.trim()}, ${args == '(' ? args : ''}`;
 				} else if(nextToken?.value == ' ' && (isDecOnly || nextToken2?.token.value == '=' || nextToken2?.token.value == ':')){
 					nextToken.value = '';
 					if(isDecOnly){
@@ -229,10 +229,10 @@ const includeFile = (includeContent, options) => {
 		straceLog('==> INCLUDE PACKAGE', filename);
 		if(existsSync(pathname)) r = _inc(pathname);
 	}
-	if(!dontInclude){
-		return r;	
+	if(dontInclude){
+		return 'intentional-nothing';
 	}
-	return "";
+	return r;
 }
 
 function useImp(token, options){
@@ -518,7 +518,7 @@ function compileRewStuff(content, options) {
 			const includeContent = token.value.split(' ')[1].trim() || '';
 			const r = includeFile(includeContent, options);
 			if(r){
-				result += r;
+				result += r == 'intentional-nothing' ? '' : r;
 				aliases = {
 					...aliases,
 					...execOptions._syntaxAliases
@@ -540,8 +540,6 @@ const compileCivetStuff = (file, options) => {
 	straceLog('OPTION_PREPARE() for CURRENTFILE as', preCompileOptions);
 	const prepared = compileRewStuff(file.content, preCompileOptions);
 
-	// console.log(prepared);
-
 	const compileOptions = {
 		...preCompileOptions,
 		bare: true,

package/package.json

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